From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Mon, 18 Apr 2011 15:25:25 +0000 (-0700)
Subject: Fixed ffi/Makefile-fragment install target.
X-Git-Tag: 20110426-Gtk~2^2~1
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=92462057011513c642b97198741a172e6de067e3;p=mit-scheme.git

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 77fdbd53e..eee163e4c 100755
--- 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 b3153f4e7..054b847b6 100644
--- 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