From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 21 Jun 1994 19:37:33 +0000 (+0000)
Subject: Disregard working directory when file is loaded; use directory that
X-Git-Tag: 20090517-FFI~7163
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=42ecc4475b76c1aa48f5e4eda50224a142c1dea4;p=mit-scheme.git

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 aa56097b7..a6bdfd0e6 100644
--- 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 964617b91..6424c9782 100644
--- 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 964617b91..6424c9782 100644
--- 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