bug fix

diff --git a/ChangeLog b/ChangeLog
index 2427659..cf6286d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ Tue Feb  4 18:29:42 1997  Tom Tromey  <tromey@cygnus.com>
        (AC_SUBST_PATTERN): Typo fix.
        (handle_aclocal_m4): Use ACLOCAL_AMFLAGS.
        (handle_clean): Put -recursive target before -am target.
+       (handle_merge_targets): Put basename of $config_name on @all.
+       Test confsub.test.  From Ramón García Fernández.
 
 Tue Jan 28 22:19:04 1997  Tom Tromey  <tromey@cygnus.com>
 

diff --git a/THANKS b/THANKS
index d4071a2..f1204e4 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -29,6 +29,7 @@ Markku Rossi <mtr@ngs.fi>
 Noah Friedman <friedman@gnu.ai.mit.edu>
 Nyul Laszlo <nyul@sol.cc.u-szeged.hu>
 Per Bothner <bothner@cygnus.com>
+Ramón García Fernández <ramon@jl1.quim.ucm.es>
 Steve M. Robbins <steve@nyongwa.montreal.qc.ca>
 Tatu Ylonen <ylo@ssh.fi>
 Thomas Morgan <tmorgan@pobox.com>

diff --git a/automake.in b/automake.in
index 0f7d613..7e3b3e5 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2675,7 +2675,7 @@ sub handle_merge_targets
     }
 
     push (@all, 'Makefile');
-    push (@all, $config_name)
+    push (@all, &basename ($config_name))
        if $config_name && &dirname ($config_name) eq $relative_dir;
 
     &do_one_merge_target ('info', @info);

diff --git a/tests/ChangeLog b/tests/ChangeLog
index e9b8939..c41e164 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,8 @@
 Tue Feb  4 18:41:32 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * confsub.test: Check subdir/Makefile.in to make sure dependency
+       is correct.
+
        * ansi2.test: ANSI2KNR dependency of all.
 
 Tue Dec 10 00:43:14 1996  Tom Tromey  <tromey@cygnus.com>

diff --git a/tests/confsub.test b/tests/confsub.test
index faa6d6e..c8d84fc 100755 (executable)
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -26,4 +26,8 @@ END
 
 : > subdir/config.h.in
 
-$AUTOMAKE
+$AUTOMAKE || exit 1
+
+# Make sure subdir Makefile.in doesn't itself look in the subdir.
+grep 'subdir/config.h' subdir/Makefile.in && exit 1
+exit 0