Be slightly more consistent about references to MIT_SCHEME_EXE.

It is to be interpreted as a pathname, provided that no character in
it be a make meta-character, or a shell meta-character that has
meaning within double-quotes.  It shouldn't have such constraints,
but Unix sucks.  To set the library path, use MITSCHEME_LIBRARY_PATH
rather than sticking a `--library' argument in MIT_SCHEME_EXE.

diff --git a/src/Makefile.in b/src/Makefile.in
index 52d736c63b6bc7e2a184d343104d6c84dd60965b..de7da23ac43cab406a503aea91f7d2aca0273f96 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -94,7 +94,7 @@ compiler/machines/svm/svm1-defns.h: \
          compiler/machines/svm/assembler-runtime.scm \
          compiler/machines/svm/compile-assembler.scm
        ( cd compiler/machines/svm/ \
-         && $(MIT_SCHEME_EXE) --batch-mode --load compile-assembler \
+         && "$(MIT_SCHEME_EXE)" --batch-mode --load compile-assembler \
                </dev/null )
 
 all-liarc:

diff --git a/src/Setup.sh b/src/Setup.sh
index 27318e240df16637c05cdb3069ef6665dece0ba5..575df1bf30223ac61c6542fd2afa0ca7eb0b3897 100755 (executable)
--- a/src/Setup.sh
+++ b/src/Setup.sh
@@ -36,7 +36,7 @@ set -e
 #   src/configure.ac
 #   src/etc/make-native.sh
 
-if ! ${MIT_SCHEME_EXE} --batch-mode --eval '(%exit)' > /dev/null 2> /dev/null
+if ! "${MIT_SCHEME_EXE}" --batch-mode --eval '(%exit)' > /dev/null 2> /dev/null
 then
     cat <<EOF >&2
 *** Error in ${0}

diff --git a/src/etc/make-native.sh b/src/etc/make-native.sh
index e48b1c4e53ccd7831765542160d06dad0521cacb..401cc2460cb9409339338124e5f6fcaada824071 100755 (executable)
--- a/src/etc/make-native.sh
+++ b/src/etc/make-native.sh
@@ -78,9 +78,9 @@ EOF
   exit 1
 }
 
-test_program='(begin (write microcode-id/compiled-code-type) (%exit 0))'
+test_exp='(begin (write microcode-id/compiled-code-type) (%exit 0))'
 scheme_failure=
-cc_type=`${MIT_SCHEME_EXE} --batch-mode --eval "${test_program}" 2>/dev/null` \
+cc_type=`"${MIT_SCHEME_EXE}" --batch-mode --eval "${test_exp}" 2>/dev/null` \
   || scheme_failure=yes
 
 if [ yes = "${scheme_failure}" ]; then

diff --git a/src/microcode/makegen/makeinit.sh b/src/microcode/makegen/makeinit.sh
index 2af6265a85a61c2beeef7346deae313d34ba77e7..e0c130b1306066c72826df095e612488544e056d 100755 (executable)
--- a/src/microcode/makegen/makeinit.sh
+++ b/src/microcode/makegen/makeinit.sh
@@ -48,7 +48,7 @@ touch Makefile.in
 # "config.h", because dependencies are generated by running GCC -M on
 # the source files, which refer to "config.h".
 
-${MIT_SCHEME_EXE:=mit-scheme} --batch-mode <<EOF
+"${MIT_SCHEME_EXE:-mit-scheme}" --batch-mode <<EOF
 (begin
   (load "makegen/makegen.scm")
   (generate-makefile))