Replace hard-wired "scheme" calls with retargetable defaulted env vars.

Use GNU standard double-dashed switch args by default in release 7.7+.

This forces you to rebind the env var if building w/ pre-7.7 bootstrap,
which is good:  it makes you be explicit about mis-matched bootstraps.

A forthcoming update to "src/README.txt" spells out the details.

diff --git a/v7/src/etc/compile.sh b/v7/src/etc/compile.sh
index acef4b2cda96df8222d3cc22b93264816a516175..e12d4fa2967b22e6e0486c2ed995b0864643f7f9 100755 (executable)
--- a/v7/src/etc/compile.sh
+++ b/v7/src/etc/compile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: compile.sh,v 1.5 2003/03/10 20:12:30 cph Exp $
+# $Id: compile.sh,v 1.6 2006/06/02 06:37:44 ihtfisp Exp $
 #
 # Copyright 2002,2003 Massachusetts Institute of Technology
 #
@@ -30,6 +30,6 @@ else
   exit 1
 fi
 if [ -z "${SCHEME_COMPILER}" ]; then
-    SCHEME_COMPILER="scheme -compiler -heap 4000"
+    SCHEME_COMPILER="scheme --compiler --heap 4000"
 fi
 ${SCHEME_COMPILER} < "${DIR}/etc/compile.scm"

diff --git a/v7/src/imail/update-changelog.sh b/v7/src/imail/update-changelog.sh
index 3689d3bb6519698898fc3981c4441d8128437569..39d564ed51820d5093d8bf70a59962ab617ed30c 100755 (executable)
--- a/v7/src/imail/update-changelog.sh
+++ b/v7/src/imail/update-changelog.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
-scheme -large <<***EOF***
+if [ -z "${SCHEME_LARGE}" ]; then
+    SCHEME_LARGE="scheme --large"
+fi
+${SCHEME_LARGE} <<***EOF***
 (load-option 'RCS)
 (rcs-directory-log "."
                   '((CHANGELOG? #t)

diff --git a/v7/src/microcode/makegen/makeinit.sh b/v7/src/microcode/makegen/makeinit.sh
index d242de2d45a52091dc3861f3846057ce97cebcd6..7d6b5d08a9d3c22a4794d648288351582e0926b4 100755 (executable)
--- a/v7/src/microcode/makegen/makeinit.sh
+++ b/v7/src/microcode/makegen/makeinit.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: makeinit.sh,v 1.10 2003/02/14 18:28:31 cph Exp $
+# $Id: makeinit.sh,v 1.11 2006/06/02 06:37:44 ihtfisp Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -31,7 +31,10 @@
 # Generate "Makefile.in" from "Makefile.in.in".  Requires "config.h",
 # because dependencies are generated by running GCC -M on the source
 # files, which refer to "config.h".
-scheme -heap 2000 <<EOF
+if [ -z "${SCHEME_LARGE}" ]; then
+    SCHEME_LARGE="scheme --large"
+fi
+${SCHEME_LARGE} <<EOF
 (load "makegen/makegen.scm")
 (generate-makefile "makegen/Makefile.in.in"
                   "Makefile.deps"