Rename @CROSS@ to @IF_CROSS@.

diff --git a/src/Makefile.in b/src/Makefile.in
index c7bdc4a32459a0511f7586400b27211875b92d90..4e82512c1ddd0211e8a3303c2a77ba7e2fc74d1e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -94,9 +94,9 @@ all-native: compile-ssp
 all-native: compile-star-parser
 all-native: compile-win32
 all-native: compile-xml
-@CROSS@all-native: cross-end
+@IF_CROSS@all-native: cross-end
 
-@CROSS@COMPILER_SETTINGS = (set! compiler:cross-compiling? true)
+@IF_CROSS@COMPILER_SETTINGS = (set! compiler:cross-compiling? true)
 
 HOST_SCHEME = '$(MIT_SCHEME_EXE)' --batch-mode
 BOOTSTRAP_COMPILER = $(BOOTSTRAP_TOOLCHAIN)
@@ -116,7 +116,7 @@ boot/syntaxer.com:
 microcode/scheme: compile-microcode
 
 lib/runtime.com: compile-runtime
-@CROSS@lib/runtime.com: cross-end
+@IF_CROSS@lib/runtime.com: cross-end
 lib/runtime.com: microcode/scheme
        (. etc/functions.sh && get_fasl_file && cd runtime \
          && (echo '(disk-save "../$@")' \

diff --git a/src/configure.ac b/src/configure.ac
index 41aa4f345ab477285f858e25266bfe417f99e225..e75833cf9168edc9d299f93c3bd728a478d885c0 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -59,9 +59,9 @@ AC_ARG_ENABLE([cross-compiling],
        [Cross-compile scheme, even if to the same target]))
 : ${enable_cross_compiling=no}
 if test "x$enable_cross_compiling" = xyes; then
-    CROSS=
+    IF_CROSS=
 else
-    CROSS=\#
+    IF_CROSS=\#
 fi
 
 AC_ARG_WITH([default-target],
@@ -166,7 +166,8 @@ AC_SUBST([INSTALL_LIARC_BUNDLES])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([AUXDIR_NAME])
 AC_SUBST([AUXDIR])
-AC_SUBST([CROSS])
+AC_SUBST([IF_CROSS])
+AC_SUBST([IF_SVM])
 
 AC_PROG_INSTALL
 AC_PROG_LN_S