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 77bd4a10cbf557a4dbef0f99a451422fca006854..b28077734ae1120dc88410ec0086c0e731d2f2ea 100644 (file)
--- 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 bee7d572323e0168ddc1519299235db17ffa77c3..815a57d8bc6227e878e88818b2fc52770b8d8d36 100644 (file)
--- 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)