From 7d2e4386b3a45b936282ac5567f61718431593f6 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Thu, 25 Oct 2001 09:06:03 +0000 Subject: [PATCH] Thu Oct 25 02:01:27 2001 Michael Jennings (mej) Argh. This configure.in/configure.ac thing is getting really old. SVN revision: 5573 --- ChangeLog | 4 ++++ configure.ac | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16e7e16..da0ce53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4413,3 +4413,7 @@ Fixed a couple remaining bugs in 0.9.1, including that really annoying problem people keeping whining about where Eterm won't build without Imlib2. It will now. :P ---------------------------------------------------------------------- +Thu Oct 25 02:01:27 2001 Michael Jennings (mej) + +Argh. This configure.in/configure.ac thing is getting really old. +---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index e255d07..a59461a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl# $Id: configure.in,v 1.55 2001/08/23 21:04:36 mej Exp $ +dnl# $Id: configure.in,v 1.56 2001/10/21 13:21:04 mej Exp $ AC_INIT(src/feature.h) AM_INIT_AUTOMAKE(Eterm, 0.9.1) @@ -850,7 +850,8 @@ AC_CHECK_LIB(Kenny, life_signs, , [ fi CONFIG_SEARCH_PATH=`eval eval eval eval eval echo "${sysconfdir}/$PACKAGE/themes:/etc/$PACKAGE/themes:${datadir}/$PACKAGE/themes"` -AC_DEFINE_UNQUOTED(CONFIG_SEARCH_PATH, "~/.Eterm/themes:$CONFIG_SEARCH_PATH") +CONFIG_SEARCH_PATH=`eval eval eval eval eval echo "$CONFIG_SEARCH_PATH:${sysconfdir}/$PACKAGE:/etc/$PACKAGE:${datadir}/$PACKAGE"` +AC_DEFINE_UNQUOTED(CONFIG_SEARCH_PATH, "~/.Eterm/themes:~/.Eterm:$CONFIG_SEARCH_PATH") # Do replacements on theme files and such. All variables to be replaced # by this routine MUST be exported before the awk script runs. if test "X$PKGDATADIR" = "X" ; then @@ -885,7 +886,7 @@ basedir=. AM_CONFIG_HEADER(config.h) AC_OUTPUT(Makefile bg/Makefile doc/Makefile utils/Makefile pix/Makefile - src/Makefile themes/Makefile Eterm.spec Eterm-mdk.spec) + src/Makefile themes/Makefile) # Mega evals to make sure all the relative variables get resolved. BINDIR=`eval eval eval eval echo ${bindir}`