X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf-install%2FMakefile;h=68926adc66f15fe1bf930889a605cc3409a331f9;hb=4ed3f0d08c3a57a6762018d9622f253ab9d0f2b6;hp=5ec18e70ad2f9aeb6d8e12c69e80a05fb52debb7;hpb=08e218c9bd9fdfb1e4dcc5f5e245feea17762471;p=sbcl.git

diff --git a/contrib/asdf-install/Makefile b/contrib/asdf-install/Makefile
index 5ec18e7..68926ad 100644
--- a/contrib/asdf-install/Makefile
+++ b/contrib/asdf-install/Makefile
@@ -4,7 +4,10 @@ EXTRA_INSTALL_TARGETS=asdf-install-install
 include ../asdf-module.mk
 
 asdf-install-install: asdf-install
-	if test -f $(INSTALL_ROOT)/bin/sbcl-asdf-install ; then \
-	 mv $(INSTALL_ROOT)/bin/sbcl-asdf-install $(INSTALL_ROOT)/bin/sbcl-asdf-install.old ; \
-	 fi
-	cp asdf-install $(INSTALL_ROOT)/bin/sbcl-asdf-install
+	if test -f $(BUILD_ROOT)$(INSTALL_ROOT)/bin/sbcl-asdf-install ; then \
+	  mv $(BUILD_ROOT)$(INSTALL_ROOT)/bin/sbcl-asdf-install $(BUILD_ROOT)$(INSTALL_ROOT)/bin/sbcl-asdf-install.old ; \
+	fi
+# KLUDGE: mv rather than cp because keeping asdf-install in that
+# directory interferes with REQUIRE, and this is done before the tar 
+# in ../asdf-module.mk.  Better solutions welcome.
+	mv asdf-install $(BUILD_ROOT)$(INSTALL_ROOT)/bin/sbcl-asdf-install