Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl
Modified Files:
configure.in
Log Message:
Fix sysconfdir for a specified prefix.
Split datadir from sysconfdir to allow separate configure args.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/configure.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- configure.in 23 Oct 2006 14:55:09 -0000 1.86
+++ configure.in 24 Oct 2006 20:53:04 -0000 1.87
@@ -30,14 +30,27 @@
else
AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${PACKAGE}/locale",
[Locale data directory])
fi
-
-dnl Set PACKAGE_DATA_DIR and PACKAGE_SYSCONF_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
- AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${ac_default_prefix}/etc", [System
Configuration Directory])
+
+dnl Set PACKAGE_SYSCONF_DIR in config.h.
+if test "x${sysconfdir}" = 'x${prefix}/etc'; then
+ if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${ac_default_prefix}/etc",
[System Configuration Directory])
+ else
+ AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${prefix}/etc", [System
Configuration Directory])
+ fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared
Data Directory])
- AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${sysconfdir}", [System
Configuration Directory])
+ AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${sysconfdir}", [System
Configuration Directory])
+fi
+
+dnl Set PACKAGE_DATA_DIR in config.h.
+if test "x${datadir}" = 'x${prefix}/share'; then
+ if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
+ else
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared
Data Directory])
+ fi
+else
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [Shared Data Directory])
fi
dnl Set PACKAGE_LIB_DIR in config.h.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
