From: Tom Tromey <tromey@redhat.com>
Date: Sat, 4 Apr 1998 01:02:52 +0000 (+0000)
Subject: ac_output fix from doug evans
X-Git-Tag: Release-1-3~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8959c36da470298d7a2ba886bfeda494b7c82d6;p=thirdparty%2Fautomake.git

ac_output fix from doug evans
---

diff --git a/ChangeLog b/ChangeLog
index eb17a6ac7..5241b90e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr  3 15:43:46 1998  Doug Evans  <devans@seba.cygnus.com>
+
+	* 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  <tromey@cygnus.com>
 
 	* ansi2knr.c, texinfo.tex: New versions from respective
diff --git a/THANKS b/THANKS
index 1ba9a3231..2d5b4b03c 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 098957aaa..d3a2a9b24 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 b418bdeba..f24004d91 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 Fri Apr  3 13:04:50 1998  Tom Tromey  <tromey@cygnus.com>
 
+	* colon5.test: New file.
+
 	* exdir2.test: New file.
 	* instdata.test: New file.
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ecb83a366..45f26b439 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 5b5ecc350..63477ba16 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 000000000..f1ca62641
--- /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