X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=driver%2FMakefile;h=016eab2f4484d3158b8109f2d641d222a60532f8;hb=80d071f68134bf3ad89d4de0d83807e2f0ec32c0;hp=f552a36e3461cca9a95f2bc6d8dfc1a476d70203;hpb=f81cdd82f37081696d2c7b20a7749ec3158ae3a4;p=ghc-hetmet.git

diff --git a/driver/Makefile b/driver/Makefile
index f552a36..016eab2 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -7,16 +7,15 @@
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = mangler split ghci
+SUBDIRS = mangler split ghc ghc-pkg 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 += ghc-usage.txt ghci-usage.txt
@@ -27,6 +26,10 @@ INSTALL_DATAS += ghc-usage.txt ghci-usage.txt
 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