fixed output3.test

diff --git a/ChangeLog b/ChangeLog
index 366053c..c7e1c35 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 proper name onto @inputs.
+       Test output3.test.
+
        * automake.in (handle_configure): Pass correct args to automake
        invocations.  Test remake2.test.
 

diff --git a/automake.in b/automake.in
index a4178d1..d2ac0f0 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2486,7 +2486,7 @@ sub handle_configure
        {
            # Normal usage.
            $local = &basename ($file);
-           @inputs = ($file . '.in');
+           @inputs = ($local . '.in');
        }
 
        # Skip files not in this directory.

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3f02c27..4409c08 100644 (file)
--- 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 remake2.test
+colon3.test remake.test output.test output2.test remake2.test output3.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/output3.test b/tests/output3.test
new file mode 100755 (executable)
index 0000000..311fe03
--- /dev/null
+++ b/tests/output3.test
@@ -0,0 +1,23 @@
+#! /bin/sh
+
+# Yet another AC_OUTPUT test.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_OUTPUT([Makefile
+tests/Makefile tests/defs],
+[blah])
+END
+
+: > Makefile.am
+
+mkdir tests
+: > tests/Makefile.am
+: > tests/defs.in
+
+$AUTOMAKE