More fixes

6 files changed, 31 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 74c797c4e..c9990ac7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat May 18 10:57:40 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* automake.in (handle_tests): Don't push TESTS onto dist_common.
+	(initialize_global_constants): Put install-sh and mkinstalldirs
+	into @common_files.  Test insh2.test.
+
 Fri May 17 09:02:02 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* automake.in (handle_source_transform): Don't generate _OBJECTS
diff --git a/automake.in b/automake.in
index 19bd0c3c0..33f657571 100755
--- a/automake.in
+++ b/automake.in
@@ -1887,7 +1887,6 @@ sub handle_tests
 {
     return if ! &variable_defined ('TESTS');
 
-    &push_dist_common (split (' ', $contents{'TESTS'}));
     push (@check, 'check-TESTS');
     push (@phony, 'check-TESTS');
     # FIXME use $(SHELL) here?  That is what Ulrich suggests.  Maybe a
@@ -2409,7 +2408,7 @@ sub initialize_global_constants
 	 "README", "THANKS", "TODO", "NEWS", "COPYING", "COPYING.LIB",
 	 "INSTALL", "ABOUT-NLS", "ChangeLog", "configure", "configure.in",
 	 "config.guess", "config.sub", "AUTHORS", "BACKLOG", "ABOUT-GNU",
-	 "libversion.in", "mdate-sh"
+	 "libversion.in", "mdate-sh", "mkinstalldirs", "install-sh"
 	 );
 
     # Commonly used files we auto-include, but only sometimes.
@@ -2417,7 +2416,7 @@ sub initialize_global_constants
 	(
 	 "version.texi", "aclocal.m4", "acconfig.h", "config.h.top",
 	 "config.h.bot", "stamp-h.in", "ansi2knr.c",
-	 "ansi2knr.1", 'stamp-vti', "mkinstalldirs", "install-sh"
+	 "ansi2knr.1", 'stamp-vti'
 	 );
 
     $USAGE = "\
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 933e2ed38..bc06985d4 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Sat May 18 10:51:37 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* insh2.test: New file.
+
 Fri May 17 17:32:35 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* number.test: New file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f5ab9b4bb..f32645155 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,7 @@ acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \
 confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
 canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
 target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \
-canon3.test mdate2.test subdir.test backsl.test package.test number.test
+canon3.test mdate2.test subdir.test backsl.test package.test number.test \
+insh2.test
 
 EXTRA_DIST = defs $(TESTS)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4ddb4c7e2..611409dcf 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -45,7 +45,8 @@ acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \
 confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
 canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
 target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \
-canon3.test mdate2.test subdir.test backsl.test package.test number.test
+canon3.test mdate2.test subdir.test backsl.test package.test number.test \
+insh2.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs
diff --git a/tests/insh2.test b/tests/insh2.test
new file mode 100755
index 000000000..217411d89
--- /dev/null
+++ b/tests/insh2.test
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# Test for bug where install-sh not included in distribution.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+pkgdata_DATA =
+magic:
+	@echo $(DISTFILES)
+END
+
+$AUTOMAKE || exit 1
+
+make -s -f Makefile.in magic | grep install-sh