From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Tue, 17 Sep 2013 03:56:47 +0000 (-0700)
Subject: ffi: Fix install-shim's installation directory.
X-Git-Tag: release-9.2.0~107
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=85e9a2c3b988869ee92c757599db20451599f645;p=mit-scheme.git

ffi: Fix install-shim's installation directory.

Write to the first directory on the library-directory-path.
---

diff --git a/src/ffi/build.scm.in b/src/ffi/build.scm.in
index 43df2bcf3..4a44dfded 100644
--- a/src/ffi/build.scm.in
+++ b/src/ffi/build.scm.in
@@ -34,13 +34,11 @@ USA.
   (run-command (append CCLD LDFLAGS (command-line) MODULE_LDFLAGS)))
 
 (define (install-shim libname)
-  (let ((library-dir (merge-pathnames (pathname-as-directory libname)
-				      (system-library-directory-pathname))))
-    (run-command (list "install" "-m" "644"
-		       (string-append libname "-shim.so")
-		       (string-append libname "-types.bin")
-		       (string-append libname "-const.bin")
-		       (->namestring library-dir)))))
+  (run-command (list "install" "-m" "644"
+		     (string-append libname "-shim.so")
+		     (string-append libname "-types.bin")
+		     (string-append libname "-const.bin")
+		     (->namestring (system-library-directory-pathname)))))
 
 (define (install-load-option name #!optional directory)
   (guarantee-string name 'INSTALL-OPTION)