Mercurial > octave
changeset 21288:1a21a0f6364e
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.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Wed, 17 Feb 2016 13:13:36 -0800 |
| parents | c4b9567f9405 |
| children | 952854b61ac9 |
| files | bootstrap.conf build-aux/common.mk |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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) }