fixed output4.test

diff --git a/ChangeLog b/ChangeLog
index c7e1c35..d4c0bc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sat Dec  7 11:34:39 1996  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_configure): Put full path to file onto
+       @rewritten_inputs.  Test output4.test.
+
        * automake.in (handle_configure): Put proper name onto @inputs.
        Test output3.test.
 

diff --git a/automake.in b/automake.in
index d2ac0f0..dd825b8 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2478,15 +2478,18 @@ sub handle_configure
        if ($file =~ /^(.*):(.*)$/)
        {
            # This is the ":" syntax of AC_OUTPUT.
-           @inputs = split (':', $2);
            $file = $1;
            $local = &basename ($file);
+           @inputs = split (':', $2);
+           @rewritten_inputs = &rewrite_inputs_into_dependencies (@inputs);
        }
        else
        {
            # Normal usage.
            $local = &basename ($file);
            @inputs = ($local . '.in');
+           @rewritten_inputs =
+               &rewrite_inputs_into_dependencies ($file . '.in');
        }
 
        # Skip files not in this directory.
@@ -2498,8 +2501,6 @@ sub handle_configure
        # Skip any Makefile.
        next if $local eq 'Makefile';
 
-       @rewritten_inputs = &rewrite_inputs_into_dependencies (@inputs);
-
        $output_rules .= ($local . ': '
                          . '$(top_builddir)/config.status '
                          . join (' ', @rewritten_inputs) . "\n"

diff --git a/tests/ChangeLog b/tests/ChangeLog
index b4112e8..58a1707 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,6 @@
 Sat Dec  7 12:52:45 1996  Tom Tromey  <tromey@cygnus.com>
 
+       * output4.test: New file.
        * output3.test: New file.
        * remake2.test: New file.
        * output2.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4409c08..123bef0 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,7 +19,8 @@ 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 remake2.test output3.test
+colon3.test remake.test output.test output2.test remake2.test output3.test \
+output4.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/output4.test b/tests/output4.test
new file mode 100755 (executable)
index 0000000..91e960f
--- /dev/null
+++ b/tests/output4.test
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+# It's hard to believe there are so many AC_OUTPUT-related bugs.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_OUTPUT(tests/Makefile tests/defs)
+END
+
+mkdir tests
+: > tests/defs.in
+: > tests/Makefile.am
+
+$AUTOMAKE || exit 1
+
+grep tests/defs.in tests/Makefile.in && exit 1
+exit 0