* Makefile.am (do_subst): Fix the substitution of @configure_input@.

(automake, aclocal): Create the output atomically and make it
read-only, as done in the Autoconf package.
* lib/Automake/Makefile.am (do_subst): Fix the substitution of
@configure_input@.
(Config.pm): Create the output atomically and make it read-only.
* m4/Makefile.am ($(top_srcdir)/m4/amversion.m4): Substitute
@configure_input@ and make the output read-only.
* lib/Automake/Config.in, m4/amversion.in, tests/aclocal.in,
tests/automake.in, tests/defs.in: Add a @configure_input@ line.

1 files changed, 9 insertions, 4 deletions

diff --git a/bootstrap b/bootstrap
index 130fa8a34..aae84976c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -92,12 +92,17 @@ cp -rf lib/* automake-$APIVERSION
 
 dosubst ()
 {
-  sed -e "s%@PERL@%$PERL%g" \
-      -e "s%@VERSION@%$VERSION%g" \
-      -e "s%@APIVERSION@%$APIVERSION%g" \
+  rm -f $2
+  in=`echo $1 | sed 's,^.*/,,'`
+  sed -e "s%@APIVERSION@%$APIVERSION%g" \
       -e "s%@PACKAGE@%$PACKAGE%g" \
+      -e "s%@PERL@%$PERL%g" \
+      -e "s%@SHELL@%$BOOTSTRAP_SHELL%g" \
+      -e "s%@VERSION@%$VERSION%g" \
       -e "s%@datadir@%$datadir%g" \
-      -e "s%@SHELL@%$BOOTSTRAP_SHELL%g" $1 > $2
+      -e "s%@configure_input@%Generated from $in; do not edit by hand.%g" \
+      $1 > $2
+  chmod -w $2
 }