Change library pathnames to be relative to

`(system-library-directory-pathname)' so that they will dynamically
changed depending on the microcode's defaults.

diff --git a/v7/src/edwin/autold.scm b/v7/src/edwin/autold.scm
index 52111b32bb94bd5f78b338230725c606cfdf7b59..92a1676df410a0940dca0749fca07de339ee19bf 100644 (file)
--- a/v7/src/edwin/autold.scm
+++ b/v7/src/edwin/autold.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/autold.scm,v 1.43 1989/04/28 22:46:55 cph Rel $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/autold.scm,v 1.44 1989/08/03 23:33:05 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989 Massachusetts Institute of Technology
 ;;;
@@ -194,7 +194,8 @@
 
 (define (load-edwin-file filename package #!optional purify?)
   (let ((pathname
-        (merge-pathnames (->pathname filename) edwin-binary-directory)))    (temporary-message "Loading file \"" (pathname->string pathname) "\"")
+        (merge-pathnames (->pathname filename) (edwin-binary-directory))))
+    (temporary-message "Loading file \"" (pathname->string pathname) "\"")
     (let ((scode (fasload pathname true)))
       (if (or (default-object? purify?) purify?) (purify scode))
       (scode-eval scode (->environment package))))  (append-message " -- done"))

diff --git a/v7/src/edwin/hlpcom.scm b/v7/src/edwin/hlpcom.scm
index 41882c46671628bfa2f65e1c2a04583460a28bfc..79bcdc0b926b63d912756d609c3a59794e612d31 100644 (file)
--- a/v7/src/edwin/hlpcom.scm
+++ b/v7/src/edwin/hlpcom.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/hlpcom.scm,v 1.88 1989/04/28 22:50:06 cph Rel $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/hlpcom.scm,v 1.89 1989/08/03 23:32:55 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989 Massachusetts Institute of Technology
 ;;;
@@ -265,7 +265,8 @@ If you want VALUE to be a string, you must surround it with doublequotes."
        (if buffer
            (select-buffer buffer)
            (let ((buffer (new-buffer (pathname->buffer-name pathname))))
-             (read-buffer buffer edwin-tutorial-pathname)            (set-buffer-pathname! buffer pathname)
+             (read-buffer buffer (edwin-tutorial-pathname))
+             (set-buffer-pathname! buffer pathname)
              (set-buffer-truename! buffer false)
              (select-buffer buffer)
              (set-current-major-mode! (ref-mode-object fundamental))

diff --git a/v7/src/edwin/info.scm b/v7/src/edwin/info.scm
index eb6d321014ebe12a9610e8f4fa7cd3b70262798d..e1226d3fc2def5642aa6aca930ffb974d90d58b3 100644 (file)
--- a/v7/src/edwin/info.scm
+++ b/v7/src/edwin/info.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/info.scm,v 1.91 1989/08/03 01:34:05 cph Exp $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/info.scm,v 1.92 1989/08/03 23:32:45 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989 Massachusetts Institute of Technology
 ;;;
@@ -594,7 +594,12 @@ The name may be an abbreviation of the reference name."
                                   (eq? (car directory) 'SELF)))
                            (pathname-directory-path
                             (current-default-pathname))
-                           (->pathname (ref-variable info-directory)))))))             (if (file-exists? pathname)
+                           (let ((info-directory
+                                  (ref-variable info-directory)))
+                             (if info-directory
+                                 (->pathname info-directory)
+                                 (edwin-info-directory))))))))
+               (if (file-exists? pathname)
                    pathname
                    (let ((pathname*
                           (pathname-new-name

diff --git a/v7/src/edwin/loadef.scm b/v7/src/edwin/loadef.scm
index 5a2310d206830a477f3a035e13867ff93d5cc9de..4d5fae74973f336c79af3109f376c07c3d029d9b 100644 (file)
--- a/v7/src/edwin/loadef.scm
+++ b/v7/src/edwin/loadef.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/loadef.scm,v 1.4 1989/08/03 01:32:31 cph Exp $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/loadef.scm,v 1.5 1989/08/03 23:32:32 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989 Massachusetts Institute of Technology
 ;;;
@@ -61,8 +61,10 @@ The Scheme code is executed when the node is selected."
   true)
 
 (define-variable info-directory
-  "Default directory pathname for Info documentation files."
-  edwin-info-directory)
+  "If not false, default directory for Info documentation files.
+Otherwise the standard directory is used."
+  false)
+
 (define-variable info-previous-search
   "Default search string for Info \\[info-search] command to search for."
   false)

diff --git a/v7/src/edwin/paths.scm b/v7/src/edwin/paths.scm
index 2bf79ddb36b3d0414278f106697050a3715ea240..f7031ea12710443c9280cc3633e090c7ac196508 100644 (file)
--- a/v7/src/edwin/paths.scm
+++ b/v7/src/edwin/paths.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/paths.scm,v 1.3 1989/08/02 16:18:23 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/paths.scm,v 1.4 1989/08/03 23:33:15 cph Exp $
 
 Copyright (c) 1989 Massachusetts Institute of Technology
 
@@ -36,11 +36,21 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-(define edwin-binary-directory
-  (string->pathname "/usr/local/lib/mit-scheme/edwin/autoload/"))
+(define (edwin-binary-directory)
+  (pathname-as-directory
+   (merge-pathnames (string->pathname "autoload")
+                   (edwin-library-directory-pathname))))
 
-(define edwin-info-directory
-  (string->pathname "/usr/local/lib/mit-scheme/edwin/info/"))
+(define (edwin-info-directory)
+  (pathname-as-directory
+   (merge-pathnames (string->pathname "info")
+                   (edwin-library-directory-pathname))))
 
-(define edwin-tutorial-pathname
-  (string->pathname "/usr/local/lib/mit-scheme/edwin/TUTORIAL"))
\ No newline at end of file
+(define (edwin-tutorial-pathname)
+  (merge-pathnames (string->pathname "TUTORIAL")
+                  (edwin-library-directory-pathname)))
+
+(define (edwin-library-directory-pathname)
+  (pathname-as-directory
+   (merge-pathnames (string->pathname "edwin")
+                   (system-library-directory-pathname))))
\ No newline at end of file