changeset 35:9bf8b9f0f09d

fixed unexpanded $prefix in template paths i.e. I hacked the AutoHELLstuff even more ugly :-/
author meillo@marmaro.de
date Fri, 07 May 2010 16:42:58 +0200 (2010-05-07)
parents 8ea86ac25658
children 9cb4031fa5e0
files configure.ac
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Fri May 07 13:50:23 2010 +0200
+++ b/configure.ac	Fri May 07 16:42:58 2010 +0200
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(masqmail, 0.2.21, oku@debian.org)
+AC_INIT(masqmail, 0.2.21, meillo@marmaro.de)
 AC_CONFIG_SRCDIR([src/masqmail.c])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE()
@@ -271,9 +271,12 @@
 AC_DEFINE_UNQUOTED(CONF_DIR, "${with_confdir}", [The configuration file location])
 AC_SUBST(with_confdir)
 
-dnl well, /me/ thought that autoconf should make things _easy_ ...
 test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-AC_DEFINE_UNQUOTED(DATA_DIR, "`eval echo \""$datadir"\"`/masqmail", [The data directory])
+
+dnl well, /me/ thought that autoconf should make things _easy_ ... -- oku
+dnl I needed the two `eval's to get the variable expanded in all cases -- meillo
+dnl this is just horrible! -- meillo
+AC_DEFINE_UNQUOTED(DATA_DIR, "`eval eval echo $datadir`/masqmail", [The data directory])
 
 dnl gymnastics to get the correct path where masqmail should be installed
 dnl we need this to call ourselves in failmsg.c
@@ -288,7 +291,6 @@
 fi
 
 AC_OUTPUT(Makefile \
-	tests/Makefile \
 	src/Makefile \
 	src/base64/Makefile \
 	src/md5/Makefile \