Reinstate the driver/ghc directory, to create a versioned GHC program

[ghc-hetmet.git] / driver / Makefile

diff --git a/driver/Makefile b/driver/Makefile
index f552a36..0eb10c6 100644 (file)
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -7,16 +7,15 @@
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = mangler split ghci
+SUBDIRS = mangler split ghc 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
 
 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