* automake.in (&read_main_am_file): s/generated automatically/

generated/.
Insert @configure_input@, since 2.50 no longer output this
automatically for Makefiles.

diff --git a/ChangeLog b/ChangeLog
index f71dbc2ca61240d2755979ef778a68ac031b9867..4f424ed3e8b16cde6b8f2d7cabd52a5cc9736631 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-19  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&read_main_am_file): s/generated automatically/
+       generated/.
+       Insert @configure_input@, since 2.50 no longer output this
+       automatically for Makefiles.
+
 2001-10-19  Kevin Ryde <user42@zip.com.au>
 
        * lib/am/check.am (check-TESTS): Add an "else true" to work with

diff --git a/Makefile.in b/Makefile.in
index eb5dc08ec6ceb92f8afdba0863858730fdf5b804..054ef1596ceeacaeacbeaef8cfc20fb6faff2e47 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5a from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
+# @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.

diff --git a/automake.in b/automake.in
index e9170def65a79b8a7098886aecac6f0c16e8b6bb..38c4e3f10dd3b61ace03a4e3ecf5d21eb3a71466 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6887,8 +6887,9 @@ sub read_main_am_file
 
     # Generate copyright header for generated Makefile.in.
     # We do discard the output of predefined variables, handled below.
-    $output_vars = ("# $in_file_name generated automatically by automake "
+    $output_vars = ("# $in_file_name generated by automake "
                   . $VERSION . " from $am_file_name.\n");
+    $output_vars .= '# ' . subst ('configure_input') . "\n";
     $output_vars .= $gen_copyright;
 
     # We want to predefine as many variables as possible.  This lets

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 88fe5b9dadd4d8681fa76978297c5149bbfe302a..c1e658e9639e84e345fd222078eec88172ee6056 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5a from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
+# @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 616f47844d0475bfd10cd4e23b739bb768bfc0e4..e3e6f7c3fcfede264e88c3c5e7608b692c8361d9 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5a from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
+# @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +44,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -55,12 +57,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 VERSION = @VERSION@
@@ -223,7 +227,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
 
 GTAGS:
-       here=`CDPATH=: && cd $(top_builddir) && pwd` \
+       here=`$(am__cd) $(top_builddir) && pwd` \
          && cd $(top_srcdir) \
          && gtags -i $(GTAGS_ARGS) $$here
 

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index eb25af63607af6e60ef958545c20cc8d94fec8d8..30ff2e26ce4c78bef6f8994ed56e73b8e7c23ba5 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5a from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
+# @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -56,12 +57,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 VERSION = @VERSION@

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 2b91e2177d6540bf15ca1e7c4f86b95e66dbc744..cc0c7f83ff736a55aaea8826bc6615c939bbc322 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5a from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
+# @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +44,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -55,12 +57,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 VERSION = @VERSION@

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 146d14a15746ea04d3e795158a6ae17cd4a09ca2..7936b61a0fcc2804c738c2212cbd94305d877a06 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5a from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
+# @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -478,7 +479,7 @@ check-TESTS: $(TESTS)
          echo "$$banner"; \
          echo "$$dashes"; \
          test "$$failed" -eq 0; \
-       fi
+       else :; fi
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)