From 8a44c8c4133d47c8f8e176b91d3291b39a96b722 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 4 Apr 1998 01:02:39 +0000 Subject: [PATCH] ac_output fix from doug evans --- ChangeLog | 6 ++++++ THANKS | 1 + automake.in | 2 +- tests/ChangeLog | 2 ++ tests/Makefile.am | 3 ++- tests/Makefile.in | 3 ++- tests/colon5.test | 20 ++++++++++++++++++++ 7 files changed, 34 insertions(+), 3 deletions(-) create mode 100755 tests/colon5.test diff --git a/ChangeLog b/ChangeLog index eb17a6ac..5241b90e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 3 15:43:46 1998 Doug Evans + + * automake.in (handle_configure): Fix setting of colon_infile + in case where multiple files are used to build Makefile. + [ Test colon5.test ] + Fri Apr 3 13:07:58 1998 Tom Tromey * ansi2knr.c, texinfo.tex: New versions from respective diff --git a/THANKS b/THANKS index 1ba9a323..2d5b4b03 100644 --- a/THANKS +++ b/THANKS @@ -13,6 +13,7 @@ Bill Fenner fenner@parc.xerox.com David A. Swierczek swiercze@mr.med.ge.com David Zaroski cz253@cleveland.Freenet.Edu Dieter Baron dillo@stieltjes.smc.univie.ac.at +Doug Evans devans@cygnus.com Erick Branderhorst branderh@iaehv.nl François Pinard pinard@iro.umontreal.ca Fred Fish fnf@ninemoons.com diff --git a/automake.in b/automake.in index 098957aa..d3a2a9b2 100755 --- a/automake.in +++ b/automake.in @@ -2997,7 +2997,7 @@ sub handle_configure # error if the .in was missing originally. local ($infile) = '$(srcdir)/' . $input_base . '.in'; local ($colon_infile); - if ($local ne $input) + if ($local ne $input || @secondary_inputs) { $colon_infile = ':' . $input . '.in'; } diff --git a/tests/ChangeLog b/tests/ChangeLog index b418bdeb..f24004d9 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,7 @@ Fri Apr 3 13:04:50 1998 Tom Tromey + * colon5.test: New file. + * exdir2.test: New file. * instdata.test: New file. diff --git a/tests/Makefile.am b/tests/Makefile.am index ecb83a36..45f26b43 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -30,7 +30,8 @@ install.test libobj7.test objc.test cond3.test cxxcpp.test \ aclocal.test alpha.test whoami.test unused.test condman.test \ texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \ java.test sinclude.test javaprim.test javasubst.test aclocalii.test \ -lex2.test libobj8.test version3.test instdata.test exdir2.test +lex2.test libobj8.test version3.test instdata.test exdir2.test \ +colon5.test EXTRA_DIST = defs $(TESTS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 5b5ecc35..63477ba1 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -93,7 +93,8 @@ install.test libobj7.test objc.test cond3.test cxxcpp.test \ aclocal.test alpha.test whoami.test unused.test condman.test \ texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \ java.test sinclude.test javaprim.test javasubst.test aclocalii.test \ -lex2.test libobj8.test version3.test instdata.test exdir2.test +lex2.test libobj8.test version3.test instdata.test exdir2.test \ +colon5.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/tests/colon5.test b/tests/colon5.test new file mode 100755 index 00000000..f1ca6264 --- /dev/null +++ b/tests/colon5.test @@ -0,0 +1,20 @@ +#! /bin/sh + +# Another multi-":" test, this time from Doug Evans. + +. $srcdir/defs || exit 1 + +cat > configure.in << 'END' +PACKAGE=nonesuch +VERSION=nonesuch +AC_ARG_PROGRAM +AC_PROG_INSTALL +AC_OUTPUT(Makefile:Makefile.in:Makefile.dep) +END + +: > Makefile.am +: > Makefile.dep + +$AUTOMAKE || exit 1 + +grep 'Makefile:Makefile.in' Makefile.in -- 2.43.5