# HG changeset patch
# User Mike Miller <mtmiller@octave.org>
# Date 1455743616 28800
# Node ID 1a21a0f6364e48e2fdf834f486b7dd917e3326dc
# Parent  c4b9567f9405e95168143708d11ceb734ad12b0b
Fix build when user's shell is not a POSIX/Bourne-style shell

* bootstrap.conf (bootstrap_post_import_hook): Initialize $SHELL to
$CONFIG_SHELL (or default) and use it.
* build-aux/common.mk (SHELL): Export for build helper scripts to use correct
shell.

diff -r c4b9567f9405 -r 1a21a0f6364e bootstrap.conf
--- a/bootstrap.conf	Wed Feb 17 11:22:04 2016 -0500
+++ b/bootstrap.conf	Wed Feb 17 13:13:36 2016 -0800
@@ -173,6 +173,9 @@
 
 bootstrap_post_import_hook ()
 {
+  SHELL=${CONFIG_SHELL-/bin/sh}
+  export SHELL
+
   ## Check for files that automake --gnu would normally look for, except
   ## AUTHORS, which we autogenerate from the documentation files along
   ## with building the rest of Octave, and INSTALL, which is linked from
@@ -188,16 +191,16 @@
   echo "generating source lists for liboctave/operators/module.mk..."
 
   rm -f liboctave/operators/*-op-*.mk
-  (cd liboctave/operators && ${SHELL:-/bin/sh} config-ops.sh)
+  (cd liboctave/operators && $SHELL config-ops.sh)
 
   echo "generating doc/interpreter/images.mk..."
 
   rm -f doc/interpreter/images.mk
-  (cd doc/interpreter && ${SHELL:-/bin/sh} config-images.sh)
+  (cd doc/interpreter && $SHELL config-images.sh)
 
   echo "generating libinterp/dldfcn/module.mk..."
 
   rm -f libinterp/dldfcn/module.mk
-  (cd libinterp/dldfcn && ${SHELL:-/bin/sh} config-module.sh)
+  (cd libinterp/dldfcn && $SHELL config-module.sh)
 }
 
diff -r c4b9567f9405 -r 1a21a0f6364e build-aux/common.mk
--- a/build-aux/common.mk	Wed Feb 17 11:22:04 2016 -0500
+++ b/build-aux/common.mk	Wed Feb 17 13:13:36 2016 -0800
@@ -12,6 +12,9 @@
 SED = @SED@
 export SED
 
+SHELL = @SHELL@
+export SHELL
+
 PERL = @PERL@
 export PERL