Mercurial > octave

comparison bootstrap.conf @ 21288:1a21a0f6364e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 41e39c9b35d3
children eebbb80bf6d9
comparison
equal deleted inserted replaced
21287:c4b9567f9405 21288:1a21a0f6364e
171 # This avoids the need for sha1sum or compatible utility in bootstrap. 171 # This avoids the need for sha1sum or compatible utility in bootstrap.
172 SKIP_PO=true 172 SKIP_PO=true
173 173
174 bootstrap_post_import_hook () 174 bootstrap_post_import_hook ()
175 { 175 {
176 SHELL=${CONFIG_SHELL-/bin/sh}
177 export SHELL
178
176 ## Check for files that automake --gnu would normally look for, except 179 ## Check for files that automake --gnu would normally look for, except
177 ## AUTHORS, which we autogenerate from the documentation files along 180 ## AUTHORS, which we autogenerate from the documentation files along
178 ## with building the rest of Octave, and INSTALL, which is linked from 181 ## with building the rest of Octave, and INSTALL, which is linked from
179 ## gnulib/doc/INSTALL by the bootstrap script. 182 ## gnulib/doc/INSTALL by the bootstrap script.
180 183
186 done 189 done
187 190
188 echo "generating source lists for liboctave/operators/module.mk..." 191 echo "generating source lists for liboctave/operators/module.mk..."
189 192
190 rm -f liboctave/operators/*-op-*.mk 193 rm -f liboctave/operators/*-op-*.mk
191 (cd liboctave/operators && ${SHELL:-/bin/sh} config-ops.sh) 194 (cd liboctave/operators && $SHELL config-ops.sh)
192 195
193 echo "generating doc/interpreter/images.mk..." 196 echo "generating doc/interpreter/images.mk..."
194 197
195 rm -f doc/interpreter/images.mk 198 rm -f doc/interpreter/images.mk
196 (cd doc/interpreter && ${SHELL:-/bin/sh} config-images.sh) 199 (cd doc/interpreter && $SHELL config-images.sh)
197 200
198 echo "generating libinterp/dldfcn/module.mk..." 201 echo "generating libinterp/dldfcn/module.mk..."
199 202
200 rm -f libinterp/dldfcn/module.mk 203 rm -f libinterp/dldfcn/module.mk
201 (cd libinterp/dldfcn && ${SHELL:-/bin/sh} config-module.sh) 204 (cd libinterp/dldfcn && $SHELL config-module.sh)
202 } 205 }
203 206