Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Makefile.am actions.c misc.c
Log Message:
Autofoo cleanups, move to bindir, pkgdatadir and friends.
===================================================================
RCS file: /cvs/e/e16/e/src/Makefile.am,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- Makefile.am 3 Nov 2007 11:57:31 -0000 1.94
+++ Makefile.am 7 Nov 2007 22:05:18 -0000 1.95
@@ -114,7 +114,11 @@
$(ECORE_CFLAGS) \
$(MODULE_CFLAGS) \
$(IMLIB2_CFLAGS) \
- $(X_CFLAGS)
+ $(X_CFLAGS) \
+ -D LOCALEDIR=\"$(localedir)\" \
+ -D ENLIGHTENMENT_BIN=\"$(bindir)\" \
+ -D ENLIGHTENMENT_LIB=\"$(pkglibdir)\" \
+ -D ENLIGHTENMENT_ROOT=\"$(pkgdatadir)\"
LDADD = \
$(LTLIBINTL) \
@@ -134,7 +138,7 @@
e16_LDFLAGS = -export-dynamic
-libe16dir = $(libdir)/e16
+libe16dir = $(pkglibdir)
libe16_LTLIBRARIES = $(LIBSND_ESD) $(LIBFNT_IFT) $(LIBFNT_XFT) $(LIBFNT_PANGO)
@@ -176,10 +180,3 @@
endif
-install-data-local:
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes
-
-uninstall-local:
- for i in $(bin_PROGRAMS); do \
- rm -f $(exec_prefix)/bin/$$i; \
- done
===================================================================
RCS file: /cvs/e/e16/e/src/actions.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -3 -r1.217 -r1.218
--- actions.c 22 Sep 2007 10:21:17 -0000 1.217
+++ actions.c 7 Nov 2007 22:05:18 -0000 1.218
@@ -60,7 +60,7 @@
#if USE_ROOTHACKLIB
if (Mode.wm.window)
- Esetenv("LD_PRELOAD", ENLIGHTENMENT_LIB "/e16/libhack.so");
+ Esetenv("LD_PRELOAD", ENLIGHTENMENT_LIB "/libhack.so");
#endif
}
===================================================================
RCS file: /cvs/e/e16/e/src/misc.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- misc.c 12 Sep 2007 21:33:50 -0000 1.79
+++ misc.c 7 Nov 2007 22:05:18 -0000 1.80
@@ -332,8 +332,7 @@
char buf[1024];
void *h;
- Esnprintf(buf, sizeof(buf), "%s/e16/lib%s_%s.so",
- ENLIGHTENMENT_LIB, lib, name);
+ Esnprintf(buf, sizeof(buf), "%s/lib%s_%s.so", ENLIGHTENMENT_LIB, lib, name);
if (EDebug(1))
Eprintf("ModLoad %s\n", buf);
h = dlopen(buf, RTLD_NOW | RTLD_LOCAL);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
