X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf-module.mk;h=15e5268b13baffce60e4fd1e39133e1b4f6686b8;hb=5a2b6553fbbbb62fa789350facd0d56bb136045f;hp=6179c56858af6f392dfb591642e72bacff420178;hpb=93c941d86b264637de20aa1b713757b704d4c1a6;p=sbcl.git

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index 6179c56..15e5268 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -1,10 +1,12 @@
 CC=gcc
-export CC
+export CC SBCL
 
-all: 
+all: $(EXTRA_ALL_TARGETS)
 	$(MAKE) -C ../asdf
-	echo "(asdf:operate 'asdf:load-op :$(SYSTEM) :force t)" | \
-	  $(SBCL) --eval '(load "../asdf/asdf")'
+	$(SBCL) --eval '(load "../asdf/asdf")' \
+	  --eval "(setf asdf::*central-registry* '((MERGE-PATHNAMES \"systems/\" (TRUENAME (SB-EXT:POSIX-GETENV \"SBCL_HOME\")))))" \
+	  --eval "(asdf:operate 'asdf:load-op :$(SYSTEM))" \
+	  --eval "(quit)"
 
 test: all
 	echo "(asdf:operate (quote asdf:load-op) :$(SYSTEM)) "\
@@ -12,6 +14,6 @@ test: all
 	  $(SBCL) --eval '(load "../asdf/asdf")'
 
 
-install:
+install: $(EXTRA_INSTALL_TARGETS)
 	tar cf - . | ( cd $(INSTALL_DIR) && tar xpvf - )
 	( cd  $(SBCL_HOME)/systems && ln -fs ../$(SYSTEM)/$(SYSTEM).asd . )