Fixed ffi/Makefile-fragment install target.

* src/Setup.sh: Create src/lib/ links to the ffi-test FFI.

* src/ffi/Makefile-fragment: Punt installing the ffi-test FFI, which
is intended for `make check', which developers run in the source tree.
The links in src/lib/ are enough; no need to copy files there.

diff --git a/src/Setup.sh b/src/Setup.sh
index 77fdbd53e82cf565a6b66226e68f37fc6489fb85..eee163e4c845d05c3849ec6967b97da3547c877d 100755 (executable)
--- a/src/Setup.sh
+++ b/src/Setup.sh
@@ -86,6 +86,10 @@ maybe_link lib/optiondb.scm ../etc/optiondb.scm
 maybe_link lib/runtime ../runtime
 maybe_link lib/mit-scheme.h ../microcode/pruxffi.h
 maybe_link lib/ffi ../ffi
+maybe_link lib/ffi-test-shim.so ../ffi/ffi-test-shim.so
+maybe_link lib/ffi-test-types.bin ../ffi/ffi-test-types.bin
+maybe_link lib/ffi-test-const.bin ../ffi/ffi-test-const.bin
+
 maybe_link config.sub microcode/config.sub
 maybe_link config.guess microcode/config.guess
 

diff --git a/src/ffi/Makefile-fragment b/src/ffi/Makefile-fragment
index b3153f4e759f96c12117694b0716c2a51835abdf..054b847b6d9c9543aa16a3b5832d9698cb9c6c84 100644 (file)
--- a/src/ffi/Makefile-fragment
+++ b/src/ffi/Makefile-fragment
@@ -3,7 +3,7 @@
 
 TARGET_DIR = $(AUXDIR)/ffi
 
-# Install the FFI option, and test lib.
+# Install the FFI option.
 install:
        rm -rf $(DESTDIR)$(TARGET_DIR)
        $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
@@ -11,8 +11,6 @@ install:
        $(INSTALL_DATA) *.bci $(DESTDIR)$(TARGET_DIR)/.
        $(INSTALL_DATA) ffi-*.pkd $(DESTDIR)$(TARGET_DIR)/.
        $(INSTALL_DATA) make.scm $(DESTDIR)$(TARGET_DIR)/.
-       $(INSTALL_DATA) ffi-test-shim.so ffi-test-types.bin ffi-test-const.bin \
-                       $(DESTDIR)$(AUXDIR_DIR)/.
 
 # Build a test library interface.
 
@@ -21,25 +19,22 @@ install:
 
 # This interface is for tests/ffi/test-ffi.scm, which uses its own
 # wrapper, so there is no need for the compile-ffi procedure (hint).
-build: ../lib/ffi-test-types.bin ../lib/ffi-test-const.bin             \
-       ../lib/ffi-test-shim.so
+build: ffi-test-shim.so ffi-test-types.bin ffi-test-const.bin
 
-../lib/ffi-test-shim.so: ffi-test-shim.o ffi-test.o
+ffi-test-shim.so: ffi-test-shim.o ffi-test.o
        $(LINK_SHIM) $^ -o $@
 
 ffi-test-shim.o: ffi-test-shim.c ffi-test.h
        $(COMPILE_SHIM) -o $@ -c $<
 
-ffi-test-shim.c ffi-test-const.c ../lib/ffi-test-types.bin: ffi-test.cdecl
+ffi-test-shim.c ffi-test-const.c ffi-test-types.bin: ffi-test.cdecl
        (echo "(load-option 'FFI)"; \
         echo '(C-generate "ffi-test" "#include \"ffi-test.h\"")') \
        | ../microcode/scheme --library ../lib --batch-mode
-       cp -p ffi-test-types.bin ../lib/ffi-test-types.bin
 
-../lib/ffi-test-const.bin: ffi-test-const.scm
+ffi-test-const.bin: ffi-test-const.scm
        echo '(sf "ffi-test-const")' \
        | ../microcode/scheme --library ../lib --batch-mode
-       cp -p ffi-test-const.bin ../lib/ffi-test-const.bin
 
 ffi-test-const.scm: ffi-test-const
        ./ffi-test-const