Enlightenment CVS committal Author : raster Project : e17 Module : libs/embryo
Dir : e17/libs/embryo Modified Files: configure.in Log Message: fix bin/lib prefix - pass as -D =================================================================== RCS file: /cvs/e/e17/libs/embryo/configure.in,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- configure.in 11 Jul 2006 09:43:25 -0000 1.43 +++ configure.in 13 Jul 2006 16:35:46 -0000 1.44 @@ -33,39 +33,35 @@ AC_SUBST(fnmatch_libs) -dnl Set PACKAGE_DATA_DIR in config.h. -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 - -dnl Set PACKAGE_BIN_DIR in config.h. if test "x${bindir}" = 'xNONE'; then if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [Installation directory for user executables]) + PACKAGE_BIN_DIR="${ac_default_prefix}/bin" else - AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation directory for user executables]) + PACKAGE_BIN_DIR="${prefix}/bin" fi else - AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation directory for user executables]) + PACKAGE_BIN_DIR="${bindir}" fi +AC_SUBST(PACKAGE_BIN_DIR) -dnl Set PACKAGE_LIB_DIR in config.h. if test "x${libdir}" = 'xNONE'; then if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Installation directory for libraries] ) + PACKAGE_LIB_DIR="${ac_default_prefix}/lib" else - AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation directory for libraries]) + PACKAGE_LIB_DIR="${prefix}/lib" fi else - AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation directory for libraries]) + PACKAGE_LIB_DIR="${libdir}" fi - -dnl Set PACKAGE_SOURCE_DIR in config.h. -packagesrcdir=`cd $srcdir && pwd` -AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory]) - +AC_SUBST(PACKAGE_LIB_DIR) + +if test "x${prefix}" = "xNONE"; then + PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}" +else + PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}" +fi +AC_SUBST(PACKAGE_DATA_DIR) + AC_OUTPUT([ Makefile embryo.pc ------------------------------------------------------------------------- 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