From: <enl...@li...> - 2004-03-23 00:35:30
|
Enlightenment CVS committal Author : xcomputerman Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: configure.in Log Message: Silly autosplat and annoying prefixes :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/configure.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- configure.in 22 Mar 2004 06:52:46 -0000 1.24 +++ configure.in 23 Mar 2004 00:25:10 -0000 1.25 @@ -10,7 +10,7 @@ AC_HEADER_STDC if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PREFIX, "/usr/local/", [Install prefix]) + AC_DEFINE_UNQUOTED(PREFIX, "/usr/local", [Install prefix]) else AC_DEFINE_UNQUOTED(PREFIX, "${prefix}", [Install prefix]) fi @@ -20,8 +20,12 @@ AC_EXPAND_DIR(PACKAGE_BIN_DIR, "$bindir") AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "$PACKAGE_BIN_DIR", [Location of binaries]) -AC_EXPAND_DIR(PACKAGE_CFG_DIR, "$sysconfdir") -AC_DEFINE_UNQUOTED(PACKAGE_CFG_DIR, "$PACKAGE_CFG_DIR", [Location of configuration data]) +# Override autosplat's destination dir settings +test $sysconfdir = '${prefix}/etc' && sysconfdir="/etc" +test $localstatedir = '${prefix}/var' && localstatedir="/var/lib" + +AC_DEFINE_UNQUOTED(PACKAGE_CFG_DIR, "${sysconfdir}", [Config data directory]) +AC_DEFINE_UNQUOTED(PACKAGE_STATE_DIR, "${localstatedir}/${PACKAGE}", [State data directory]) dnl Set PACKAGE_SOURCE_DIR in config.h. packagesrcdir=`cd $srcdir && pwd` |