X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=inline;f=configure.in;h=93ccef968e0bc591b6b69d7672689acca0e155ec;hb=2f122c20219c2e2bdfdc8e6143288afb37bcb39f;hp=f35534c55bd559e366925843a0807d25cb0463f0;hpb=9d57f5517367679f4f7be5af1aec91ac300db4e3;p=pkg%2Fabook.git

diff --git a/configure.in b/configure.in
index f35534c..93ccef9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.5.5pre1)
+AM_INIT_AUTOMAKE(abook, 0.6.0pre1)
 AM_CONFIG_HEADER(config.h)
 
 dnl ---------------
@@ -13,8 +13,12 @@ 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
+		)`
 ])
 
 ABOOK_EXPAND_PREFIX(abook_localedir, "$datadir/locale")