Under certain circumstances, not all of the macro files were

copied into the destination directory.  This changeset fixes
that bug:

* libtoolize.m4sh (func_serial_update):  Renamed local variable
`my_update_p' to `my_serial_update_p', and initialise it correctly
even when the destination file is not yet there.
Reported by Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index edd2282b1b6338230c796df0fc5a531d4a5208b8..2d8546c7fd1683fd3f80b62ab9e1ab758290ec56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-04-04  Gary V. Vaughan  <gary@gnu.org>
+
+       Under certain circumstances, not all of the macro files were
+       copied into the destination directory.  This changeset fixes
+       that bug:
+
+       * libtoolize.m4sh (func_serial_update):  Renamed local variable
+       `my_update_p' to `my_serial_update_p', and initialise it correctly
+       even when the destination file is not yet there.
+       Reported by Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
 2005-04-04  Gary V. Vaughan  <gary@gnu.org>
 
        * tests/libtoolize.at: New tests for basic libtoolize functionality

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index e2cacae0e3600e33295904d630ad250a44251f59..55fc7b924b20920ec406cb883926af51ab69001f 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -632,6 +632,7 @@ func_serial_update ()
     my_macro_regex="$4"
     my_old_macro_regex="$5"
 
+    my_serial_update_p=:
     my_return_status=1
     my_srcfile="$my_srcdir/$my_filename"
     my_destfile="$my_destdir/$my_filename"
@@ -655,10 +656,10 @@ func_serial_update ()
 
       func_serial_update_check \
         "$my_srcfile" "$my_src_serial" "$my_destfile" "$my_dest_serial"
-      my_update_p="$func_serial_update_check_result"
+      my_serial_update_p="$func_serial_update_check_result"
     fi
 
-    if $my_update_p || $opt_force; then
+    if $my_serial_update_p || $opt_force; then
       func_copy "$my_srcfile" "$my_destfile"
       my_return_status=$?
     elif test "X$my_dest_serial" = "X$my_src_serial"; then