X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=f824e3acefcf1ed0f434aa93f65e9a70f2e816c4;hb=eed437cdefb952e6c70e58012b23d436e74710af;hp=4bf9ac9a7d0a1c4cdcf00ffd4bc6c0b010bedb88;hpb=5b9164b417bd96a629adb0998796e2f9d2d5d22f;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 4bf9ac9..f824e3a 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -13,8 +13,7 @@ else
 INSTALL_FLAGS = --enable-shell-wrappers
 endif
 
-boot:
-	@:
+boot:: boot.stage.$(stage)
 
 all:: build.stage.$(stage)
 
@@ -33,16 +32,8 @@ clean distclean::
 	$(RM) -rf stage1-inplace
 	$(RM) -rf stage2-inplace
 
-# XXX Eugh, can we do this better? The problem is making extra-gcc-opts
-# infdable on both Linux and Windows. I guess this will go away when we
-# drop the mangler?
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-SET_DATA_SUBDIR = --datasubdir=.
-INPLACE_DATA_DIR = '$$prefix'
-else
-SET_DATA_SUBDIR =
-INPLACE_DATA_DIR = '$$prefix/data'
-endif
+# XXX This should be defined somewhere more central
+INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir
 
 CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
 
@@ -73,12 +64,13 @@ CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
 # It works because installPackage doesn't actually use ghc-pkg, as there's
 # no library to register
 
-build.stage.%:
+boot.stage.%:
 	$(CABAL) configure --distpref dist-stage$* \
-	                   $(SET_DATA_SUBDIR) \
 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
 	                   $(CONFIGURE_FLAGS_STAGE$*) \
 	                   $(COMMON_CONFIGURE_FLAGS)
+
+build.stage.%:
 	$(CABAL) build     --distpref dist-stage$* $(BUILD_FLAGS)
 	$(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
 	                   $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \
@@ -87,13 +79,22 @@ build.stage.%:
 	                   '$$prefix/lib' \
 	                   '$$prefix/libexec' \
 	                   '$$prefix/dynlib' \
-	                   $(INPLACE_DATA_DIR) \
+	                   '$(INPLACE_DATA_DIR)' \
 	                   '$$prefix/doc' \
 	                   '$$prefix/html' \
 	                   '$$prefix/haddock' \
 	                   --distpref dist-stage$* \
 	                   $(INSTALL_FLAGS)
 
+# XXX For now we always install the stage 2 compiler
+install:
+	$(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
+	                   '$(prefix)' '$(bindir)' '$(libdir)'            \
+                       '$(libexecdir)' '$(dynlibdir)' '$(datadir)'    \
+                       '$(docdir)' '$(htmldir)' '$(haddockdir)'       \
+	                   --distpref dist-stage2                         \
+	                   $(INSTALL_FLAGS)
+
 # XXX fix:
 #binary-dist:
 #	$(INSTALL_DIR)                      $(BIN_DIST_DIR)/utils/hsc2hs