From 2efa510963d2e6a25369084ff763f4e86e7e7c29 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Sat, 7 Dec 1996 21:30:11 +0000
Subject: [PATCH] Fix for output2.test

---
 ChangeLog          |  3 +++
 Makefile.in        |  9 +--------
 automake.in        |  2 +-
 tests/ChangeLog    |  1 +
 tests/Makefile.am  |  2 +-
 tests/remake2.test | 20 ++++++++++++++++++++
 6 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100755 tests/remake2.test

diff --git a/ChangeLog b/ChangeLog
index f50a5b7..6cb32ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sat Dec  7 11:34:39 1996  Tom Tromey  <tromey@cygnus.com>
 
+	* automake.in (handle_configure): Check dirname of $file, not of
+	$local.  Test output2.test.
+
 	* automake.in (handle_dependencies): Added some missing ";"s in
 	transforms.
 	(get_object_extension): Ditto.
diff --git a/Makefile.in b/Makefile.in
index ed29b18..6989550 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,18 +95,11 @@ default: all
 
 .SUFFIXES:
 .SUFFIXES: .texi .texinfo .info .dvi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in 
-	cd $(top_srcdir) && automake --gnits Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
 $(srcdir)/aclocal.m4: configure.in
 	cd $(srcdir) && aclocal
 
 $(srcdir)/Makefile.in: Makefile.am configure.in
-	cd $(srcdir) && automake @ARGS@ Makefile
+	cd $(srcdir) && automake --gnits Makefile
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
diff --git a/automake.in b/automake.in
index 296c234..85307e7 100755
--- a/automake.in
+++ b/automake.in
@@ -2490,7 +2490,7 @@ sub handle_configure
 	}
 
 	# Skip files not in this directory.
-	next unless &dirname ($local) eq $relative_dir;
+	next unless &dirname ($file) eq $relative_dir;
 
 	# Skip the config header.
 	next if $local eq $top_builddir . '/' . $config_name;
diff --git a/tests/ChangeLog b/tests/ChangeLog
index b3f3ff5..6646ccb 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,6 @@
 Sat Dec  7 12:52:45 1996  Tom Tromey  <tromey@cygnus.com>
 
+	* remake2.test: New file.
 	* output2.test: New file.
 
 Fri Dec  6 19:00:31 1996  Tom Tromey  <tromey@cygnus.com>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cb29e87..3f02c27 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,7 +19,7 @@ confsub.test primary.test primary2.test depend2.test spell3.test \
 comment2.test vpath.test symlink.test discover.test acinclude.test req.test \
 acsilent.test distdir.test lex2.test libobj4.test libobj5.test version.test \
 ranlib.test confvar.test confvar2.test stdlib.test cxxo.test colon2.test \
-colon3.test remake.test output.test output2.test
+colon3.test remake.test output.test output2.test remake2.test
 
 EXTRA_DIST = defs $(TESTS)
 
diff --git a/tests/remake2.test b/tests/remake2.test
new file mode 100755
index 0000000..f2961d8
--- /dev/null
+++ b/tests/remake2.test
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+# Make sure remaking rules in subdir are correct.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_OUTPUT(sub/Makefile)
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+$AUTOMAKE || exit 1
+
+grep 'automake.*sub/Makefile' Makefile.in
-- 
2.7.4