* automake.in (scan_dependency_file): Fixed test on `while' loop.

        Fixes depend2.test.  Report from Akim Demaille.

diff --git a/ChangeLog b/ChangeLog
index 254da4d17f36959536a659d9c8b83b68b08b6219..e18c673526e9aa6f8c7ff33598c6236910ba8730 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-10-20  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (scan_dependency_file): Fixed test on `while' loop.
+       Fixes depend2.test.  Report from Akim Demaille.
+
 1998-10-16  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_ltlibraries): Specify `noinst' when

diff --git a/THANKS b/THANKS
index 76a1e83b99add705e284b41a54b038ebdab35ed6..aebfd4f4ba00114efaedf303a452ab330d6bec76 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -33,6 +33,7 @@ Ian Lance Taylor      ian@cygnus.com
 Janos Farkas           chexum@shadow.banki.hu
 Jason Molenda          crash@cygnus.co.jp
 Jeff Bailey            Jbailey@phn.ca
+Jeff Garzik            jgarzik@pobox.com
 Jerome Santini         santini@chambord.univ-orleans.fr
 Jim Meyering           meyering@na-net.ornl.gov
 Joel N. Weber II       nemo@koa.iolani.honolulu.hi.us

diff --git a/automake.in b/automake.in
index 23f0eb11f7f1cd50c615906166676a11bac85eca..965bb7f5b3151f727ce9d621a20b151ccc58ae3e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2599,8 +2599,9 @@ sub scan_dependency_file
                                 ? ''
                                 : $top_builddir . '/');
 
-    while (<DEP_FILE> && ! $last_line)
+    while (<DEP_FILE>)
     {
+       last if $last_line;
        next if (/$WHITE_PATTERN/o);
        chop;
        if (! s/\\$//)