X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=driver%2FMakefile;h=3fcb4be55652e0695bdce8a0807bbde36e700697;hb=ba6f641e38fa3a0e2b211aeb9474af5ffeb20da4;hp=7a07cbdd3ab828e23d3599de4532c334151d5242;hpb=6d0dd9aa562a9f96bf875b7260675609e1171b66;p=ghc-hetmet.git

diff --git a/driver/Makefile b/driver/Makefile
index 7a07cbd..3fcb4be 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -9,7 +9,6 @@ include $(TOP)/mk/boilerplate.mk
 
 SUBDIRS = mangler split ghci
 
-INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir
 INPLACE_PKG_CONF = $(INPLACE_DATA_DIR)/package.conf
 # Used to signal that we are inplace, as opposed to installed:
 INPLACE_FILE     = $(INPLACE_DATA_DIR)/inplace
@@ -17,17 +16,20 @@ INPLACE_FILE     = $(INPLACE_DATA_DIR)/inplace
 boot all ::
 	$(MKDIRHIER) $(INPLACE_DATA_DIR)
 	test -e $(INPLACE_PKG_CONF) || echo "[]" > $(INPLACE_PKG_CONF)
-	echo "[]" > package.conf
 	touch $(INPLACE_FILE)
 
-INSTALL_DATAS += package.conf ghc-usage.txt ghci-usage.txt
+INSTALL_DATAS += ghc-usage.txt ghci-usage.txt
 
 # Since cleaning effectively uninstalls all the packages, we must 
 # remove the stamp files that the build system uses to avoid unnecessarily
-# re-installing packages.
-CLEAN_FILES += package.conf* stamp-pkg-conf*
+# re-installing the RTS
+CLEAN_FILES += stamp-pkg-conf-rts
 
 binary-dist:
+ifeq "$(WHERE_AM_I)" ""
+	echo "I don't know where I am" >&2
+	exit 1
+endif
 	for FILE in Makefile $(INSTALL_DATAS); do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done
 	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist WHERE_AM_I=$(WHERE_AM_I)/$$d; done