From e185085ee90cdf7cb876b8d73a93c7e26a9d8d5c Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 19 Oct 2001 17:07:02 +0000 Subject: [PATCH] * automake.in (&read_main_am_file): s/generated automatically/ generated/. Insert @configure_input@, since 2.50 no longer output this automatically for Makefiles. --- ChangeLog | 7 +++++++ Makefile.in | 3 ++- automake.in | 3 ++- lib/Automake/Makefile.in | 3 ++- lib/Makefile.in | 12 ++++++++---- lib/am/Makefile.in | 9 ++++++--- m4/Makefile.in | 10 +++++++--- tests/Makefile.in | 5 +++-- 8 files changed, 37 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index f71dbc2c..4f424ed3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-10-19 Akim Demaille + + * 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 * lib/am/check.am (check-TESTS): Add an "else true" to work with diff --git a/Makefile.in b/Makefile.in index eb5dc08e..054ef159 100644 --- 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 e9170def..38c4e3f1 100755 --- 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 88fe5b9d..c1e658e9 100644 --- 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 616f4784..e3e6f7c3 100644 --- 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 eb25af63..30ff2e26 100644 --- 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 2b91e217..cc0c7f83 100644 --- 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 146d14a1..7936b61a 100644 --- 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) -- 2.43.5