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 a6bdfd0e640fda64e2d9914131106e716e23267e..66d4b31ce6ec295fbadd843c5249e263966b8f30 100644 (file)
--- a/v7/src/cref/make.scm
+++ b/v7/src/cref/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 1.11 1994/06/21 19:37:33 cph Exp $
+$Id: make.scm,v 1.12 1994/06/21 19:38:49 cph Exp $
 
 Copyright (c) 1988-94 Massachusetts Institute of Technology
 
@@ -46,4 +46,4 @@ MIT in each case. |#
      (lambda ()
        (load-option 'RB-TREE)
        (package/system-loader "cref" '() false)))))
-(add-system! (make-system "CREF" 1 10 '()))
\ No newline at end of file
+(add-system! (make-system "CREF" 1 12 '()))
\ No newline at end of file

diff --git a/v7/src/edwin/make.scm b/v7/src/edwin/make.scm
index c6ac76b2c4fefd9c41f549e422f48da965977c12..1453b4cda00a26d73637d78d75d4e5d72142e53e 100644 (file)
--- a/v7/src/edwin/make.scm
+++ b/v7/src/edwin/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 3.83 1994/03/16 23:43:43 cph Exp $
+$Id: make.scm,v 3.84 1994/06/21 19:38:40 cph Exp $
 
 Copyright (c) 1989-94 Massachusetts Institute of Technology
 
@@ -36,14 +36,18 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-((access with-directory-rewriting-rule
-        (->environment '(RUNTIME COMPILER-INFO)))
- (working-directory-pathname)
- (pathname-as-directory "edwin")
- (lambda ()
-   (declare-shared-library "edwin" (lambda () true))
-   (package/system-loader
-    "edwin"
-    `((os-type . ,(intern (microcode-identification-item 'OS-NAME-STRING))))
-    'QUERY)))
-(add-system! (make-system "Edwin" 3 83 '()))
\ No newline at end of file
+(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 "edwin")
+     (lambda ()
+       (declare-shared-library "edwin" (lambda () true))
+       (package/system-loader
+       "edwin"
+       `((os-type
+          . ,(intern (microcode-identification-item 'OS-NAME-STRING))))
+       'QUERY)))))
+(add-system! (make-system "Edwin" 3 84 '()))
\ No newline at end of file

diff --git a/v7/src/sf/make.scm b/v7/src/sf/make.scm
index 6424c978257593d9e8fce88cd8ec4388dcb47170..88c9d657b9377a6c84ac26afdf902e397ba9dbc3 100644 (file)
--- a/v7/src/sf/make.scm
+++ b/v7/src/sf/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.29 1994/06/21 19:37:25 cph Exp $
+$Id: make.scm,v 4.30 1994/06/21 19:38:30 cph Exp $
 
 Copyright (c) 1988-94 Massachusetts Institute of Technology
 
@@ -47,4 +47,4 @@ MIT in each case. |#
        (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
+(add-system! (make-system "SF" 4 30 '()))
\ No newline at end of file

diff --git a/v8/src/sf/make.scm b/v8/src/sf/make.scm
index 6424c978257593d9e8fce88cd8ec4388dcb47170..88c9d657b9377a6c84ac26afdf902e397ba9dbc3 100644 (file)
--- a/v8/src/sf/make.scm
+++ b/v8/src/sf/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.29 1994/06/21 19:37:25 cph Exp $
+$Id: make.scm,v 4.30 1994/06/21 19:38:30 cph Exp $
 
 Copyright (c) 1988-94 Massachusetts Institute of Technology
 
@@ -47,4 +47,4 @@ MIT in each case. |#
        (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
+(add-system! (make-system "SF" 4 30 '()))
\ No newline at end of file