X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=configure.in;fp=configure.in;h=105cf5542bc33797f834ba5c071606996a134fd1;hb=48f49221ba69514441d1254f0a30cf6170b10cc9;hp=4076216bae822f5da673e972588bea4d1c779e3b;hpb=9d28f71348269e7075d0ff5c0b7ae4e05f358304;p=pkg%2Fabook.git

diff --git a/configure.in b/configure.in
index 4076216..105cf55 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.6.0pre1)
+AM_INIT_AUTOMAKE(abook, 0.6.0pre2)
 AM_CONFIG_HEADER(config.h)
 
 dnl ---------------
@@ -13,17 +13,14 @@ AM_GNU_GETTEXT_VERSION(0.14.1)
 
 AC_DEFUN([ABOOK_EXPAND_PREFIX], [
 	$1=$2
+	dnl expanding twice, since from autoconf 2.60 on, $datadir refers to
+	dnl $datarootdir which in turn refers to $prefix
 	$1=`(	test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-		eval echo \""[$]$1"\"	)`
+		eval tmp_abook_prefix=\""[$]$1"\"
+		eval echo $tmp_abook_prefix
+		)`
 ])
 
-dnl 
-dnl dnl Use this with autoconf >= 2.60
-dnl
-dnl ABOOK_EXPAND_PREFIX(abook_localedir, "$datarootdir/locale")
-dnl localedir="\$(datarootdir)/locale"
-dnl
-
 ABOOK_EXPAND_PREFIX(abook_localedir, "$datadir/locale")
 localedir="\$(datadir)/locale"