Fix site loading mechanism; previous try didn't work.

diff --git a/v7/src/runtime/make.scm b/v7/src/runtime/make.scm
index d73e06f778715c5b50ffe7a4813307de25ad5d5a..92527948e15f766f3d2d82cafd6a7bf4a1883a9b 100644 (file)
--- a/v7/src/runtime/make.scm
+++ b/v7/src/runtime/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/make.scm,v 14.8 1988/12/31 06:05:10 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/make.scm,v 14.9 1988/12/31 06:39:18 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -376,14 +376,9 @@ MIT in each case. |#
    (RUNTIME EMACS-INTERFACE)
    ))
 \f
-(let ((pathname
-       (let ((pathname (->pathname "site")))
-        (list-search-positive
-            (map (lambda (type) (pathname-new-type pathname type))
-                 load/default-types)
-          file-exists?))))
-  (if pathname
-      (load pathname '())))
+(let ((filename (map-filename "site")))
+  (if (file-exists? filename)
+      (eval (purify (fasload filename true)) system-global-environment)))
 
 (let ((fasload/update-debugging-info!
        (access fasload/update-debugging-info!

diff --git a/v8/src/runtime/make.scm b/v8/src/runtime/make.scm
index 23b08fd6c221efceae49c488580d7678a0330b58..1f520a3ce156871e7131d2c282961373805d44b7 100644 (file)
--- a/v8/src/runtime/make.scm
+++ b/v8/src/runtime/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/make.scm,v 14.8 1988/12/31 06:05:10 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/make.scm,v 14.9 1988/12/31 06:39:18 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -376,14 +376,9 @@ MIT in each case. |#
    (RUNTIME EMACS-INTERFACE)
    ))
 \f
-(let ((pathname
-       (let ((pathname (->pathname "site")))
-        (list-search-positive
-            (map (lambda (type) (pathname-new-type pathname type))
-                 load/default-types)
-          file-exists?))))
-  (if pathname
-      (load pathname '())))
+(let ((filename (map-filename "site")))
+  (if (file-exists? filename)
+      (eval (purify (fasload filename true)) system-global-environment)))
 
 (let ((fasload/update-debugging-info!
        (access fasload/update-debugging-info!