From b88ca08feff279cc7ca4f8198028c8e31674082f Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 7 Feb 2001 20:55:07 +0000
Subject: [PATCH] 	* distcommon.test: New file. 	* Makefile.am (TESTS):
 Added new file.

---
 tests/ChangeLog       |  5 +++++
 tests/Makefile.am     |  1 +
 tests/Makefile.in     |  1 +
 tests/distcommon.test | 27 +++++++++++++++++++++++++++
 tests/remake3.test    | 24 ++++++++++++++++++++++++
 5 files changed, 58 insertions(+)
 create mode 100755 tests/distcommon.test
 create mode 100755 tests/remake3.test

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 933acd266..73d693ca4 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-07  Tom Tromey  <tromey@redhat.com>
+
+	* distcommon.test: New file.
+	* Makefile.am (TESTS): Added new file.
+
 2001-02-04  Tom Tromey  <tromey@redhat.com>
 
 	* exsource.test: Updated for new include code.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a5933509f..dada30e35 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -210,6 +210,7 @@ recurs.test \
 recurs2.test \
 remake.test \
 remake2.test \
+remake3.test \
 req.test \
 rulepat.test \
 scripts.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5050c73e0..e6dce4f73 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -280,6 +280,7 @@ recurs.test \
 recurs2.test \
 remake.test \
 remake2.test \
+remake3.test \
 req.test \
 rulepat.test \
 scripts.test \
diff --git a/tests/distcommon.test b/tests/distcommon.test
new file mode 100755
index 000000000..6072853f0
--- /dev/null
+++ b/tests/distcommon.test
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+# A test for failure to include files provided in AC_OUTPUT into
+# DIST_COMMON
+# From Derek R. Price.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << EOF
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_OUTPUT(subdir/bar \
+	  Makefile \
+	  subdir/Makefile)
+EOF
+
+: > Makefile.am
+
+mkdir subdir
+: > subdir/Makefile.am
+: > subdir/bar.in
+
+$AUTOMAKE || exit 1
+
+# verify bar.in
+grep 'DIST_COMMON.*bar.in' subdir/Makefile.in || exit 1
+
+exit 0
diff --git a/tests/remake3.test b/tests/remake3.test
new file mode 100755
index 000000000..fe1ce8034
--- /dev/null
+++ b/tests/remake3.test
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# Make sure remaking rules work when there is no subdir Makefile.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AC_OUTPUT(Makefile sub/foo)
+END
+
+: > Makefile.am
+
+mkdir sub
+: > sub/foo.in
+
+$AUTOMAKE || exit 1
+
+grep '^sub/foo' Makefile.in
-- 
2.47.2