From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 11 Aug 2004 21:20:47 +0000 (+0000)
Subject: For PR automake/433:
X-Git-Tag: Release-1-9b~314
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=321b2eb247e6d7ee5253d7b65916e7d9fd700b33;p=thirdparty%2Fautomake.git

For PR automake/433:
* configure.ac (pkgvdatadir): Define using "$PACKAGE", not "automake".
---

diff --git a/ChangeLog b/ChangeLog
index dbffa3555..2f83db389 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-11  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	For PR automake/433:
+	* configure.ac (pkgvdatadir): Define using "$PACKAGE", not "automake".
+
 	Fix PR automake/432:
 	* lib/am/yacc.am [!%?MORE-THAN-ONE%]: Replace `#line's in y.tab.h too.
 	* tests/yacc7.test: Check this.
diff --git a/configure b/configure
index 125dc65a7..de01fa08e 100755
--- a/configure
+++ b/configure
@@ -1974,7 +1974,7 @@ APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'`
 
 
 # A versioned directory, defined here for convenience.
-pkgvdatadir="\${datadir}/automake-${APIVERSION}"
+pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION"
 
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
diff --git a/configure.ac b/configure.ac
index b2dc36fa6..e55aab901 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,7 @@ APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'`
 AC_SUBST(APIVERSION)
 
 # A versioned directory, defined here for convenience.
-pkgvdatadir="\${datadir}/automake-${APIVERSION}"
-AC_SUBST(pkgvdatadir)
+AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"])
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
 # hence `.' is really what we want for perllibdir, libdir, and acdir.