summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-10-29 15:46:10 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-10-29 15:46:54 -0700
commitc1b1be5dc59f460f4249bb337987cc37dc2ed07f (patch)
tree0d5c86c27df025bbab9f66681f36d097aa4017ca
parent59faabad3639d126adc929b22f45cfb5007fa999 (diff)
downloadgnulib-c1b1be5dc59f460f4249bb337987cc37dc2ed07f.tar.gz
Port recent gnulib-tool change to Dash
* gnulib-tool (func_create_testdir): Don't assume that the shell retokenizes after expanding "$@" inside the call to func_execute_command. Dash 0.5.8-2.1ubuntu2 does not.
-rw-r--r--ChangeLog7
-rwxr-xr-xgnulib-tool8
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 26c56b17da..16506ba193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-29 Paul Eggert <eggert@cs.ucla.edu>
+
+ Port recent gnulib-tool change to Dash
+ * gnulib-tool (func_create_testdir): Don't assume that the shell
+ retokenizes after expanding "$@" inside the call to
+ func_execute_command. Dash 0.5.8-2.1ubuntu2 does not.
+
2017-10-27 Jim Meyering <meyering@fb.com>
timespec.h: use "assure" to avoid a spurious warning
diff --git a/gnulib-tool b/gnulib-tool
index 36493a9eea..03641ae2e5 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -6478,7 +6478,9 @@ func_create_testdir ()
fi
func_execute_command ${AUTOCONF} || func_exit 1
# Explicit 'touch config.h.in': see <https://savannah.gnu.org/support/index.php?109406>.
- func_execute_command "${AUTOHEADER} && touch config.h.in" || func_exit 1
+ func_execute_command ${AUTOHEADER} &&
+ func_execute_command touch config.h.in ||
+ func_exit 1
func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1
rm -rf autom4te.cache
) || func_exit 1
@@ -6501,7 +6503,9 @@ func_create_testdir ()
fi
func_execute_command ${AUTOCONF} || func_exit 1
# Explicit 'touch config.h.in': see <https://savannah.gnu.org/support/index.php?109406>.
- func_execute_command "${AUTOHEADER} && touch config.h.in" || func_exit 1
+ func_execute_command ${AUTOHEADER} &&
+ func_execute_command touch config.h.in ||
+ func_exit 1
func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1
rm -rf autom4te.cache
) || func_exit 1