X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=3c215a3840297de03deafffe7362668664bb36a1;hb=41ea53bfeccbb2fd33e5408f1dde47b0770d30e2;hp=4160cdc6d4af62462cc38311e9831f2f1148ef90;hpb=40b2f7ad5fa53842ffa8e3f701926c373ea9a9ad;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 4160cdc..3c215a3 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -44,9 +44,6 @@ clean.stage.%:
 	-$(CABAL) clean --distpref dist-stage$*
 	$(RM) -rf stage$*-inplace
 
-# XXX This should be defined somewhere more central
-INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir
-
 CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
 
 ifeq "$(GhcWithInterpreter)" "YES"
@@ -85,10 +82,14 @@ BUILD_FLAGS=$(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
 # no library to register
 
 ifeq "$(stage)" "1"
+ifeq "$(ghc_ge_609)" "NO"
 # GHC 6.9+ can handle cross-package recompilation checking, but
 # we don't rely on the bootstrapping compiler being able to do this.
 TOUCH_MAIN = $(RM) dist-stage1/build/ghc/ghc-tmp/Main.o
 endif
+endif
+
+dist-stage1 dist-stage2 dist-stage3: dist-stage%: boot.stage.%
 
 boot.stage.%:
 	$(CABAL) configure --distpref dist-stage$*         \
@@ -99,7 +100,7 @@ boot.stage.%:
 	                   --datadir='$$libdir'            \
 	                   --datasubdir=.
 
-build.stage.%:
+build.stage.%: dist-stage%
 	$(TOUCH_MAIN)
 	$(CABAL) build     --distpref dist-stage$* $(BUILD_FLAGS)
 	$(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \