Disregard working directory when file is loaded; use directory that

file is loaded from instead.

diff --git a/v7/src/cref/make.scm b/v7/src/cref/make.scm
index aa56097b78e39fa98890c35f4d7c47729dcfe187..a6bdfd0e640fda64e2d9914131106e716e23267e 100644 (file)
--- a/v7/src/cref/make.scm
+++ b/v7/src/cref/make.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 1.10 1993/11/18 01:21:24 cph Exp $
+$Id: make.scm,v 1.11 1994/06/21 19:37:33 cph Exp $
 
-Copyright (c) 1988-93 Massachusetts Institute of Technology
+Copyright (c) 1988-94 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -36,11 +36,14 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-((access with-directory-rewriting-rule
-        (->environment '(RUNTIME COMPILER-INFO)))
- (working-directory-pathname)
- (pathname-as-directory "cref")
- (lambda ()
-   (load-option 'RB-TREE)
-   (package/system-loader "cref" '() false)))
+(with-working-directory-pathname
+    (directory-pathname (current-load-pathname))
+  (lambda ()
+    ((access with-directory-rewriting-rule
+            (->environment '(RUNTIME COMPILER-INFO)))
+     (working-directory-pathname)
+     (pathname-as-directory "cref")
+     (lambda ()
+       (load-option 'RB-TREE)
+       (package/system-loader "cref" '() false)))))
 (add-system! (make-system "CREF" 1 10 '()))
\ No newline at end of file

diff --git a/v7/src/sf/make.scm b/v7/src/sf/make.scm
index 964617b918c11be92df27b4435710847604a1a7a..6424c978257593d9e8fce88cd8ec4388dcb47170 100644 (file)
--- a/v7/src/sf/make.scm
+++ b/v7/src/sf/make.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.28 1993/11/18 01:21:39 cph Exp $
+$Id: make.scm,v 4.29 1994/06/21 19:37:25 cph Exp $
 
-Copyright (c) 1988-1993 Massachusetts Institute of Technology
+Copyright (c) 1988-94 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -36,12 +36,15 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-((access with-directory-rewriting-rule
-        (->environment '(RUNTIME COMPILER-INFO)))
- (working-directory-pathname)
- (pathname-as-directory "sf")
- (lambda ()
-   (package/system-loader "sf" '() 'QUERY)))
-((package/reference (find-package '(SCODE-OPTIMIZER))
-                   'USUAL-INTEGRATIONS/CACHE!))
+(with-working-directory-pathname
+    (directory-pathname (current-load-pathname))
+  (lambda ()
+    ((access with-directory-rewriting-rule
+            (->environment '(RUNTIME COMPILER-INFO)))
+     (working-directory-pathname)
+     (pathname-as-directory "sf")
+     (lambda ()
+       (package/system-loader "sf" '() 'QUERY)))
+    ((package/reference (find-package '(SCODE-OPTIMIZER))
+                       'USUAL-INTEGRATIONS/CACHE!))))
 (add-system! (make-system "SF" 4 28 '()))
\ No newline at end of file

diff --git a/v8/src/sf/make.scm b/v8/src/sf/make.scm
index 964617b918c11be92df27b4435710847604a1a7a..6424c978257593d9e8fce88cd8ec4388dcb47170 100644 (file)
--- a/v8/src/sf/make.scm
+++ b/v8/src/sf/make.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.28 1993/11/18 01:21:39 cph Exp $
+$Id: make.scm,v 4.29 1994/06/21 19:37:25 cph Exp $
 
-Copyright (c) 1988-1993 Massachusetts Institute of Technology
+Copyright (c) 1988-94 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -36,12 +36,15 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-((access with-directory-rewriting-rule
-        (->environment '(RUNTIME COMPILER-INFO)))
- (working-directory-pathname)
- (pathname-as-directory "sf")
- (lambda ()
-   (package/system-loader "sf" '() 'QUERY)))
-((package/reference (find-package '(SCODE-OPTIMIZER))
-                   'USUAL-INTEGRATIONS/CACHE!))
+(with-working-directory-pathname
+    (directory-pathname (current-load-pathname))
+  (lambda ()
+    ((access with-directory-rewriting-rule
+            (->environment '(RUNTIME COMPILER-INFO)))
+     (working-directory-pathname)
+     (pathname-as-directory "sf")
+     (lambda ()
+       (package/system-loader "sf" '() 'QUERY)))
+    ((package/reference (find-package '(SCODE-OPTIMIZER))
+                       'USUAL-INTEGRATIONS/CACHE!))))
 (add-system! (make-system "SF" 4 28 '()))
\ No newline at end of file