From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Sat, 12 Nov 2016 21:46:31 +0000 (-0700)
Subject: runtime/load.scm (standard-library-directory-pathname): Fix merge.
X-Git-Tag: mit-scheme-pucked-9.2.12~255
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=141935a2f36c1875912b6611f6c51864f90973b0;p=mit-scheme.git

runtime/load.scm (standard-library-directory-pathname): Fix merge.

The Gtk branch has no umodules and no lib/ subdirectory to distinguish
the standard library directory.  Use the last directory in the library
directory path.
---

diff --git a/src/runtime/load.scm b/src/runtime/load.scm
index 77bd4a10c..b28077734 100644
--- a/src/runtime/load.scm
+++ b/src/runtime/load.scm
@@ -433,7 +433,9 @@ USA.
 
 (define (standard-library-directory-pathname)
   (let ((d (system-library-directory-pathname "lib")))
-    (pathname-new-directory d (except-last-pair (pathname-directory d)))))
+    (if d
+	(pathname-new-directory d (except-last-pair (pathname-directory d)))
+	(last library-directory-path))))
 
 (define (pathname->standard-uri pathname)
   (let ((uri
diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index bee7d5723..815a57d8b 100644
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -3201,6 +3201,8 @@ USA.
 	  system-library-pathname
 	  uri->pathname
 	  user-homedir-pathname)
+  (export (runtime load)
+	  library-directory-path)
   (initialization (initialize-package!)))
 
 (define-package (runtime pathname unix)