Fixed bugs

diff --git a/ChangeLog b/ChangeLog
index 48681076294fb27dfac6fc408cbc9a62d2ea54c5..aa4a1d8cd19f72124b492a4cb9ce8c47633373a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu May 16 09:21:48 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (scan_configure): Look for install-sh and
+       mkinstalldirs here.
+       (initialize_global_constants): Moved mdate-sh from
+       common_sometimes to common_files.  Test mdate2.test.
+
 Tue May 14 21:52:01 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (seen_maint_mode): New global.

diff --git a/Makefile.in b/Makefile.in
index 07904a5c9e5959b8c71895ba9c0a6b33e33a146e..691836171b8f6fe47f1663701bd65eb0c109c22d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,8 +86,8 @@ DATA = $(pkgdata_DATA)
 
 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
 Makefile.in NEWS README THANKS TODO aclocal.m4 automake.in config.guess \
-config.sub configure configure.in install-sh mdate-sh mkinstalldirs \
-stamp-vti texinfo.tex version.texi
+config.sub configure configure.in mdate-sh stamp-vti texinfo.tex \
+version.texi
 
 
 PACKAGE = @PACKAGE@

diff --git a/automake.in b/automake.in
index 8d2b0d23c67c12cad1739420d9f9827a37a439ea..9b91eb1f39ab9db7f595f772278d649a7beef10b 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1379,9 +1379,6 @@ sub handle_configure
     &am_line_error ('SUBDIRS', "AC_PROG_MAKE_SET must be used in configure.in")
        if &variable_defined ('SUBDIRS') && ! $seen_make_set;
 
-    # Look for some files we need.  Always check for these.
-    &require_config_file ($FOREIGN, 'install-sh', 'mkinstalldirs');
-
     local ($top_reldir);
     if ($relative_dir ne '.')
     {
@@ -2080,6 +2077,13 @@ sub scan_configure
     @input_files = @make_list if (! @input_files);
 
     close (CONFIGURE);
+
+    # Look for some files we need.  Always check for these.  This
+    # check must be done for every run, even those where we are only
+    # looking at a subdir Makefile.  We must set relative_dir so that
+    # the file-finding machinery works.
+    local ($relative_dir) = '.';
+    &require_config_file ($FOREIGN, 'install-sh', 'mkinstalldirs');
 }
 
 ################################################################
@@ -2394,14 +2398,14 @@ 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"
+        "libversion.in", "mdate-sh"
         );
 
     # Commonly used files we auto-include, but only sometimes.
     @common_sometimes =
        (
         "version.texi", "aclocal.m4", "acconfig.h", "config.h.top",
-        "config.h.bot", "stamp-h.in", "mdate-sh", "ansi2knr.c",
+        "config.h.bot", "stamp-h.in", "ansi2knr.c",
         "ansi2knr.1", 'stamp-vti', "mkinstalldirs", "install-sh"
         );
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 3f128d503760cb60cd579af10b925ecc67c23664..fa5f38c96f7dc3f444700961bf59132a8eb53ea0 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,6 +1,10 @@
+Thu May 16 09:15:57 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * subdir.test: New file.
+
 Tue May 14 10:17:17 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
-       * mdate2.test: New file.
+       * mdate2.test: New file, from report by Jim Meyering.
 
        * canon3.test: New file.
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 06f283ac8d22022e5bde63e3679b8b583a5f90d4..31e542a05b8a57e43fa3ba1e01686cd4e5bb2607 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,6 @@ 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
+canon3.test mdate2.test subdir.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1f43d4c37fe1f1a4504b06e07c9bdd02825a629d..1860ecee8be21a93fd7e9efaad828ea15108079b 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -45,7 +45,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
+canon3.test mdate2.test subdir.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs

diff --git a/tests/defs b/tests/defs
index 9da6249007275be5dcfb9d166398c6bd4ee214f3..cb5b2a984b55c3ca5f62f7788980c9eb335ffe1f 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -22,8 +22,8 @@ rm -rf testSubDir > /dev/null 2>&1
 mkdir testSubDir
 cd testSubDir
 
-# FIXME: build appropriate environment in test directory.
-# Eg create configure.in, touch all necessary files, etc.
+# Build appropriate environment in test directory.  Eg create
+# configure.in, touch all necessary files, etc.
 cat > configure.in << 'END'
 AC_ARG_PROGRAM
 fp_PROG_INSTALL

diff --git a/tests/subdir.test b/tests/subdir.test
new file mode 100755 (executable)
index 0000000..a4b52aa
--- /dev/null
+++ b/tests/subdir.test
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+# Test to make sure install-sh and mkinstalldirs correctly found in
+# subdirs.
+
+. $srcdir/defs || exit 1
+
+mkdir zot
+
+cat > configure.in << 'END'
+AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
+fp_PROG_INSTALL
+AC_OUTPUT(Makefile zot/Makefile)
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = zot
+END
+
+cat > zot/Makefile.am << 'END'
+pkgdata_DATA =
+END
+
+$AUTOMAKE