For PR automake/433:

* configure.ac (pkgvdatadir): Define using "$PACKAGE", not "automake".

diff --git a/ChangeLog b/ChangeLog
index dbffa3555d08704d803ef5470a790bb18664c004..2f83db389fbd09841e3b1a6a13a2e8f703a3c9fe 100644 (file)
--- 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 125dc65a76b8a84087bd1f9d4045bc6caf493fe9..de01fa08e6874e9e489ab444346d087dbbc6cee9 100755 (executable)
--- 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 b2dc36fa6207fc8a6abf979d913c35db40e71cc1..e55aab9016dfc9b00c7b6d3d2624cc4b22f19c2e 100644 (file)
--- 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.