--- configure.orig	Sun Jul 10 11:14:51 2005
+++ configure	Thu Jul 28 14:28:34 2005
@@ -602,2 +602,3 @@
 APIVERSION
+APIPVERSION
 pkgvdatadir
@@ -2098,6 +2099,6 @@
 APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'`
-
+APIPVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\)\.\([0-9]*[a-z]*\).*$/\1\2/'`
 
 # A versioned directory, defined here for convenience.
-pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION"
+pkgvdatadir="\${datadir}/automake${APIPVERSION}"
 
@@ -3102,2 +3103,3 @@
 APIVERSION=$APIVERSION
+APIPVERSION=$APIPVERSION
 
@@ -3244,2 +3246,3 @@
 APIVERSION!$APIVERSION$ac_delim
+APIPVERSION!$APIPVERSION$ac_delim
 pkgvdatadir!$pkgvdatadir$ac_delim
@@ -3256,3 +3259,3 @@
 
-  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 75; then
+  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 76; then
     break