For PR automake/433:

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

diff --git a/ChangeLog b/ChangeLog
index fd344e8b0684e1c454b0f1b4fdc570ec09d95d1e..763b098bbe76b195b865783a217d106dde8ecba4 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 f428bb5a5c6ef4e2d271f5359b98f22a48aaaf1a..8943eebf2040676c629700f3c380c2a7e70ad62b 100755 (executable)
--- a/configure
+++ b/configure
@@ -881,7 +881,7 @@ esac
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -1728,7 +1728,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',
@@ -2839,11 +2839,6 @@ esac
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -2882,6 +2877,12 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
         fi;;
       esac
     done` || { (exit 1); exit 1; }
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub

diff --git a/configure.ac b/configure.ac
index d858822f46fb24e9634678087f026066f7e48dfa..b2144935b4d3dbcdad7d1a036a4d12ca647eeeb6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -49,8 +49,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.