From: Gary V. Vaughan Date: Mon, 4 Apr 2005 17:30:46 +0000 (+0000) Subject: Under certain circumstances, not all of the macro files were X-Git-Tag: release-2-1b~686 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=251628e093c8220fac1c5fe81cbcc878dcba2dc8;p=thirdparty%2Flibtool.git 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 --- diff --git a/ChangeLog b/ChangeLog index edd2282b1..2d8546c7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-04-04 Gary V. Vaughan + + 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 + 2005-04-04 Gary V. Vaughan * tests/libtoolize.at: New tests for basic libtoolize functionality diff --git a/libtoolize.m4sh b/libtoolize.m4sh index e2cacae0e..55fc7b924 100644 --- 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