Add new operation `system-library-directory-pathname' which

standardizes where to find various run-time library files.

diff --git a/v7/src/runtime/option.scm b/v7/src/runtime/option.scm
index 2814c1332b6516f4158126b64c4f091f46a17468..7586cb612db3f183e114878d48358562bd7e431f 100644 (file)
--- a/v7/src/runtime/option.scm
+++ b/v7/src/runtime/option.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/option.scm,v 14.4 1989/06/22 23:50:53 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/option.scm,v 14.5 1989/08/03 23:06:31 cph Exp $
 
 Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
@@ -40,11 +40,10 @@ MIT in each case. |#
 (define (load-option name)
   (let ((entry (assq name options))
        (pathname
-        (merge-pathnames (make-pathname false false '("options")
-                                        false false false)
-                         (pathname-directory-path
-                          (string->pathname
-                           ((ucode-primitive microcode-tables-filename)))))))    (if (not entry)
+        (pathname-as-directory
+         (merge-pathnames (string->pathname "options")
+                          (system-library-directory-pathname)))))
+    (if (not entry)
        (error "Unknown option name" name))
     (for-each
      (lambda (descriptor)

diff --git a/v7/src/runtime/pathnm.scm b/v7/src/runtime/pathnm.scm
index d67f7264ace9030ca38bde3efa2eb483b57dca8f..ce56bd851ce3bc13d900cadcff05c362a88f957e 100644 (file)
--- a/v7/src/runtime/pathnm.scm
+++ b/v7/src/runtime/pathnm.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/pathnm.scm,v 14.4 1989/04/20 01:28:01 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/pathnm.scm,v 14.5 1989/08/03 23:06:22 cph Exp $
 
-Copyright (c) 1988 Massachusetts Institute of Technology
+Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -359,4 +359,8 @@ See the files unkpth.scm, vmspth.scm, or unxpth.scm for examples.|#
         (or (pathname->input-truename
              (merge-pathnames pathname (working-directory-pathname)))
             (pathname->input-truename
-             (merge-pathnames pathname (home-directory-pathname)))))))
\ No newline at end of file
+             (merge-pathnames pathname (home-directory-pathname)))))))
+
+(define (system-library-directory-pathname)
+  (pathname-directory-path
+   (string->pathname ((ucode-primitive microcode-tables-filename 0)))))
\ No newline at end of file