Eric Blake wrote:
> --- gnulib-tool 28 Aug 2006 19:39:49 -0000 1.150
> +++ gnulib-tool 30 Aug 2006 17:33:43 -0000
> @@ -2416,6 +2416,20 @@
> if test $# = 0; then
> # No further arguments. Guess the user wants to update all of
> them.
> for m4base in $m4dirs; do
> + if test $mode = update ; then
> + local_gnulib_dir=
> + libname=libgnu
> + supplied_libname=
> + sourcebase=
> + docbase=
> + testsbase=
> + inctests=
> + avoidlist=
> + lgpl=
> + makefile_name=
> + libtool=
> + macro_prefix=
> + fi
> func_import
> done
> else
Ah, now I understand better what you meant. Your patch would be ok to
apply after converting tabs to spaces [hint for your .emacs:
;; Tabs are anachronistic.
(setq-default indent-tabs-mode nil)
], but I hope the following is a little more maintainable:
2006-08-31 Bruno Haible <[EMAIL PROTECTED]>
* gnulib-tool: When calling func_import more than once, do it in a
subshell.
Reported by Eric Blake <[EMAIL PROTECTED]>.
*** gnulib-tool 30 Aug 2006 18:13:34 -0000 1.151
--- gnulib-tool 31 Aug 2006 13:06:34 -0000
***************
*** 2417,2423 ****
if test $# = 0; then
# No further arguments. Guess the user wants to update all of
them.
for m4base in $m4dirs; do
! func_import
done
else
# Really ambiguous.
--- 2417,2428 ----
if test $# = 0; then
# No further arguments. Guess the user wants to update all of
them.
for m4base in $m4dirs; do
! # Perform func_import in a subshell, so that variable values
! # such as
! # local_gnulib_dir, avoidlist, sourcebase, m4base, docbase,
! # testsbase, libname, lgpl, makefile_name, libtool,
macro_prefix
! # don't propagate from one directory to another.
! (func_import) || exit 1
done
else
# Really ambiguous.
