From: Taylor R Campbell <campbell@mumble.net>
Date: Thu, 5 Aug 2010 18:57:53 +0000 (+0000)
Subject: Be slightly more consistent about references to MIT_SCHEME_EXE.
X-Git-Tag: 20101212-Gtk~122
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=0a169a387e77133e7d49dd51227304d16abec554;p=mit-scheme.git

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 52d736c63..de7da23ac 100644
--- 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 27318e240..575df1bf3 100755
--- 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 e48b1c4e5..401cc2460 100755
--- 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 2af6265a8..e0c130b13 100755
--- 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))