ffi: Add DESTDIR support.

diff --git a/src/blowfish/Makefile.in b/src/blowfish/Makefile.in
index 659df89741d3b763aa433e2474214b462a94e95e..4db21fc6ab58d1601448fd39e5d25e533d8c1e32 100644 (file)
--- a/src/blowfish/Makefile.in
+++ b/src/blowfish/Makefile.in
@@ -36,8 +36,8 @@ check:
 
 install:
        ( echo '(begin'; \
-         echo '  (install-shim "blowfish")'; \
-         echo '  (install-load-option "blowfish"))' ) \
+         echo '  (install-shim "$(DESTDIR)" "blowfish")'; \
+         echo '  (install-load-option "$(DESTDIR)" "blowfish"))' ) \
        | $(exe) -- *.com *.bci *.pkd make.scm
 
 clean:

diff --git a/src/ffi/build.scm.in b/src/ffi/build.scm.in
index 10ea8e74591e046a1e916e1465b1d300bb5b7f4c..4f094f57291ad1fdf10a2597006f78f3f6c63a9b 100644 (file)
--- a/src/ffi/build.scm.in
+++ b/src/ffi/build.scm.in
@@ -33,27 +33,37 @@ USA.
 (define (link-shim)
   (run-command (append CCLD LDFLAGS (command-line) MODULE_LDFLAGS)))
 
-(define (install-shim libname)
+(define (install-shim destdir libname)
+  (guarantee-string destdir 'INSTALL-SHIM)
+  (guarantee-string libname 'INSTALL-SHIM)
   (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)))))
+                    (string-append destdir
+                                   (->namestring
+                                    (system-library-directory-pathname))))))
 
-(define (install-load-option name #!optional directory)
-  (guarantee-string name 'INSTALL-OPTION)
+(define (install-load-option destdir name #!optional directory)
+  (guarantee-string destdir 'INSTALL-LOAD-OPTION)
+  (guarantee-string name 'INSTALL-LOAD-OPTION)
   (let ((dir (if (default-object? directory) name directory)))
-    (guarantee-string dir 'INSTALL-OPTION)
-    (let ((library-dir (->namestring
-                       (merge-pathnames (pathname-as-directory dir)
-                                        (system-library-directory-pathname)))))
+    (guarantee-string dir 'INSTALL-LOAD-OPTION)
+    (let ((library-dir
+          (string-append destdir (->namestring
+                                  (merge-pathnames
+                                   (pathname-as-directory dir)
+                                   (system-library-directory-pathname))))))
       (run-command (list "rm" "-rf" library-dir))
       (run-command (list "mkdir" library-dir))
       (run-command (list "chmod" "755" library-dir))
-      (run-command (append (list "install" "-m" "644")
+      (run-command (append (list "install" "-m644")
                           (command-line) (list library-dir))))
-    (rewrite-file (merge-pathnames "optiondb.scm"
-                                  (system-library-directory-pathname))
+    (rewrite-file (string-append
+                  destdir
+                  (->namestring
+                   (merge-pathnames "optiondb.scm"
+                                    (system-library-directory-pathname))))
                  (lambda (in out)
                    (rewrite-optiondb name dir in out)))))
 

diff --git a/src/gdbm/Makefile b/src/gdbm/Makefile
index f3340dbe26b130c4878cdca4d10ab08ab93a99ac..727829fb47736ae1ac4f820b6ed8fc11b1024c8c 100644 (file)
--- a/src/gdbm/Makefile
+++ b/src/gdbm/Makefile
@@ -31,8 +31,8 @@ check:
 
 install:
        ( echo '(begin'; \
-         echo '  (install-shim "gdbm")'; \
-         echo '  (install-load-option "gdbm2" "gdbm"))' ) \
+         echo '  (install-shim "$(DESTDIR)" "gdbm")'; \
+         echo '  (install-load-option "$(DESTDIR)" "gdbm2" "gdbm"))' ) \
        | $(exe) -- *.com *.bci *.pkd make.scm
 
 clean distclean maintainer-clean:

diff --git a/src/md5/Makefile.in b/src/md5/Makefile.in
index 7a2b387cca2dbf7673473e6c93d95fdc22f51f7d..cfc8fc72f7e8b0fe364895889f90a8b2071e0c04 100644 (file)
--- a/src/md5/Makefile.in
+++ b/src/md5/Makefile.in
@@ -36,8 +36,8 @@ check:
 
 install:
        ( echo '(begin'; \
-         echo '  (install-shim "md5")'; \
-         echo '  (install-load-option "md5"))' ) \
+         echo '  (install-shim "$(DESTDIR)" "md5")'; \
+         echo '  (install-load-option "$(DESTDIR)" "md5"))' ) \
        | $(exe) -- *.com *.bci *.pkd make.scm
 
 clean:

diff --git a/src/mhash/Makefile.in b/src/mhash/Makefile.in
index 594a5dcfb249f3302347d42da02da1830fb29d38..66d2e9b9ef17a70f8d240fd67cdb09badf01e69a 100644 (file)
--- a/src/mhash/Makefile.in
+++ b/src/mhash/Makefile.in
@@ -36,8 +36,8 @@ check:
 
 install:
        ( echo '(begin'; \
-         echo '  (install-shim "mhash")'; \
-         echo '  (install-load-option "mhash"))' ) \
+         echo '  (install-shim "$(DESTDIR)" "mhash")'; \
+         echo '  (install-load-option "$(DESTDIR)" "mhash"))' ) \
        | $(exe) -- *.com *.bci *.pkd make.scm
 
 clean:

diff --git a/src/runtime/ffi.scm b/src/runtime/ffi.scm
index 29e0c7ba7e12c697ae9a02648cb94d12e3425cf3..371c80df1f9e8e067ba417cf61744cd088434a0e 100644 (file)
--- a/src/runtime/ffi.scm
+++ b/src/runtime/ffi.scm
@@ -537,14 +537,14 @@ USA.
   (load-ffi-quietly)
   ((environment-lookup (->environment '(ffi)) 'link-shim)))
 
-(define (install-shim library)
+(define (install-shim destdir library)
   (load-ffi-quietly)
-  ((environment-lookup (->environment '(ffi)) 'install-shim) library))
+  ((environment-lookup (->environment '(ffi)) 'install-shim) destdir library))
 
-(define (install-load-option name #!optional directory)
+(define (install-load-option destdir name #!optional directory)
   (load-ffi-quietly)
   ((environment-lookup (->environment '(ffi)) 'install-load-option)
-   name directory))
+   destdir name directory))
 
 (define (load-ffi-quietly)
   (if (not (name->package '(FFI)))