* lib/Automake/Config.in: New file.

* lib/Automake/Makefile.am (nodist_perllib_DATA, do_subst,
CLEANFILES): New variables.
(Config.pm): New rule.
* Makefile.am (maintainer-check): Adjust expected differences
between automake.in and automake.
* aclocal.in, automake.in: Use Automake::Config.

1 files changed, 19 insertions, 17 deletions

diff --git a/bootstrap b/bootstrap
index d1860847a..2ac80347c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -90,28 +90,29 @@ rm -rf automake-$APIVERSION
 mkdir automake-$APIVERSION
 cp -rf lib/* automake-$APIVERSION
 
+dosubst ()
+{
+  sed -e "s%@PERL@%$PERL%g" \
+      -e "s%@VERSION@%$VERSION%g" \
+      -e "s%@APIVERSION@%$APIVERSION%g" \
+      -e "s%@PACKAGE@%$PACKAGE%g" \
+      -e "s%@datadir@%$datadir%g" \
+      -e "s%@SHELL@%$BOOTSTRAP_SHELL%g" $1 > $2
+}
+
+
+# Create temporary replacement for lib/Automake/Config.pm
+dosubst automake-$APIVERSION/Automake/Config.in \
+        automake-$APIVERSION/Automake/Config.pm
+
 # Create temporary replacement for aclocal
-sed -e "s%@PERL@%$PERL%g" \
-    -e "s%@VERSION@%$VERSION%g" \
-    -e "s%@APIVERSION@%$APIVERSION%g" \
-    -e "s%@PACKAGE@%$PACKAGE%g" \
-    -e "s%@datadir@%$datadir%g" \
-    -e "s%@SHELL@%$BOOTSTRAP_SHELL%g" \
-    aclocal.in >aclocal.tmp
+dosubst aclocal.in aclocal.tmp
 
 # Overwrite amversion.m4
-sed -e "s%@VERSION@%$VERSION%g" \
-    -e "s%@APIVERSION@%$APIVERSION%g" \
-    m4/amversion.in >m4/amversion.m4
+dosubst m4/amversion.in m4/amversion.m4
 
 # Create temporary replacement for automake
-sed -e "s%@PERL@%$PERL%g" \
-    -e "s%@VERSION@%$VERSION%g" \
-    -e "s%@APIVERSION@%$APIVERSION%g" \
-    -e "s%@PACKAGE@%$PACKAGE%g" \
-    -e "s%@datadir@%$datadir%g" \
-    -e "s%@SHELL@%$BOOTSTRAP_SHELL%g" \
-    automake.in >automake.tmp
+dosubst automake.in automake.tmp
 
 # Run the autotools.
 $PERL ./aclocal.tmp -I m4
@@ -121,3 +122,4 @@ $PERL ./automake.tmp
 # Remove temporary files and directories
 rm -rf aclocal-$APIVERSION automake-$APIVERSION
 rm -f aclocal.tmp automake.tmp
+rm -f lib/Automake/Config.pm