X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=driver%2FMakefile;h=5207214068a1c8909388acdebeb8f6b8b0375707;hb=f2853b4bb7b07f1ad7774c60ec9c5ed7ccfca772;hp=7953d5f353f1f8efa27b91cf22431ba8d33b212c;hpb=ce5560e4c105456248b75f5928e39f6ce81ddd37;p=ghc-hetmet.git

diff --git a/driver/Makefile b/driver/Makefile
index 7953d5f..5207214 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -7,26 +7,29 @@
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = mangler split ghci
+SUBDIRS = mangler split ghc ghci runhaskell
 
-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
 
 boot all ::
 	$(MKDIRHIER) $(INPLACE_DATA_DIR)
-	test -e $(INPLACE_PKG_CONF) || echo "[]" > $(INPLACE_PKG_CONF)
+	test -f $(INPLACE_PKG_CONF) || echo "[]" > $(INPLACE_PKG_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