[PATCH] tiny cosmetic configure_input changes

[Ralf Wildenhues]

The following patch against CVS adjusts the comments inside the
automake and aclocal perl scripts to be somewhat more descriptive.
On my system, e.g. in automake it used to misleadingly read:
# Makefile.  Generated from Makefile.in by configure.

Besides, since some more files are generated as well, I added a
@configure_input@ line to the .in files and adjusted corresponding
Makefile rules.  Not causing long lines in generated files through
long paths is avoided by explicit names, hence the apparent overuse
of variables.

The diff is only against non-generated files.
Please feel free to ignore this for automake 1.8.

Regards,
Ralf

Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.224
diff -u -r1.224 Makefile.am
--- Makefile.am 11 Nov 2003 22:48:53 -0000      1.224
+++ Makefile.am 9 Dec 2003 09:13:15 -0000
@@ -59,18 +59,18 @@
 ## by hand.  We use a funny notation here to avoid configure
 ## substitutions in our text.
 do_subst = sed -e 's,address@hidden@],$(datadir),g' -e 
's,address@hidden@],$(PERL),g' \
-           -e 's,address@hidden@],@configure_input@,g' \
+           -e "s,address@hidden@],$$out.  Generated from $$in by building 
automake.,g" \
            -e 's,address@hidden@],$(PACKAGE),g' \
            -e 's,address@hidden@],$(VERSION),g' \
            -e 's,address@hidden@],$(APIVERSION),g' \
            -e 's,address@hidden@],$(SHELL),g'
 
 automake: automake.in Makefile
-       $(do_subst) < $(srcdir)/automake.in > automake
+       in=automake.in; out=automake; $(do_subst) < $(srcdir)/automake.in > 
automake
        chmod +x automake
 
 aclocal: aclocal.in Makefile
-       $(do_subst) < $(srcdir)/aclocal.in > aclocal
+       in=aclocal.in; out=aclocal; $(do_subst) < $(srcdir)/aclocal.in > aclocal
        chmod +x aclocal
 
 ## The master location for INSTALL is lib/INSTALL.
Index: lib/Automake/Config.in
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Config.in,v
retrieving revision 1.1
diff -u -r1.1 Config.in
--- lib/Automake/Config.in      6 Aug 2003 21:20:15 -0000       1.1
+++ lib/Automake/Config.in      9 Dec 2003 09:13:19 -0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2003  Free Software Foundation, Inc.      -*- Perl -*-
+# @configure_input@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
Index: lib/Automake/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- lib/Automake/Makefile.am    12 Aug 2003 17:52:09 -0000      1.19
+++ lib/Automake/Makefile.am    9 Dec 2003 09:13:19 -0000
@@ -50,13 +50,13 @@
 ## by hand.  We use a funny notation here to avoid configure
 ## substitutions in our text.
 do_subst = sed -e 's,address@hidden@],$(datadir),g' -e 
's,address@hidden@],$(PERL),g' \
-           -e 's,address@hidden@],@configure_input@,g' \
+           -e "s,address@hidden@],$$out.  Generated from $$in by building 
automake.,g" \
            -e 's,address@hidden@],$(PACKAGE),g' \
            -e 's,address@hidden@],$(VERSION),g' \
            -e 's,address@hidden@],$(APIVERSION),g' \
            -e 's,address@hidden@],$(SHELL),g'
 
 Config.pm: Config.in Makefile
-       $(do_subst) <$(srcdir)/Config.in >$@
+       in=Config.in; out=Config.pm; $(do_subst) <$(srcdir)/Config.in >$@
 
 EXTRA_DIST = Config.in
Index: m4/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/m4/Makefile.am,v
retrieving revision 1.50
diff -u -r1.50 Makefile.am
--- m4/Makefile.am      10 Nov 2003 20:55:32 -0000      1.50
+++ m4/Makefile.am      9 Dec 2003 09:13:19 -0000
@@ -65,7 +65,9 @@
 # Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
 # how amversion.m4 appears in our dependencies.
 $(top_srcdir)/m4/amversion.m4: $(srcdir)/amversion.in
+       in=amversion.in; out=amversion.m4; \
        sed -e 's,address@hidden@],$(VERSION),g' \
            -e 's,address@hidden@],$(APIVERSION),g' \
+           -e "s,address@hidden@],$$out.  Generated from $$in by building 
automake.,g" \
            $(srcdir)/amversion.in > address@hidden
        mv -f address@hidden $@
Index: m4/amversion.in
===================================================================
RCS file: /cvs/automake/automake/m4/amversion.in,v
retrieving revision 1.5
diff -u -r1.5 amversion.in
--- m4/amversion.in     11 Nov 2003 22:06:17 -0000      1.5
+++ m4/amversion.in     9 Dec 2003 09:13:19 -0000
@@ -1,5 +1,6 @@
 #                                                        -*- Autoconf -*-
 # Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# @configure_input@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
Index: tests/aclocal.in
===================================================================
RCS file: /cvs/automake/automake/tests/aclocal.in,v
retrieving revision 1.1
diff -u -r1.1 aclocal.in
--- tests/aclocal.in    6 Sep 2003 21:10:39 -0000       1.1
+++ tests/aclocal.in    9 Dec 2003 09:13:19 -0000
@@ -1,4 +1,5 @@
 #!/bin/sh
+# @configure_input@
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
Index: tests/automake.in
===================================================================
RCS file: /cvs/automake/automake/tests/automake.in,v
retrieving revision 1.1
diff -u -r1.1 automake.in
--- tests/automake.in   6 Sep 2003 21:10:39 -0000       1.1
+++ tests/automake.in   9 Dec 2003 09:13:19 -0000
@@ -1,4 +1,5 @@
 #!/bin/sh
+# @configure_input@
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
Index: tests/defs.in
===================================================================
RCS file: /cvs/automake/automake/tests/defs.in,v
retrieving revision 1.25
diff -u -r1.25 defs.in
--- tests/defs.in       10 Nov 2003 20:55:33 -0000      1.25
+++ tests/defs.in       9 Dec 2003 09:13:19 -0000
@@ -1,4 +1,6 @@
 # -*- shell-script -*-
+# @configure_input@
+#
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 #