Fix Trac #2311: creates subdirs for package coverage information

[ghc-hetmet.git] / ghc / Makefile

diff --git a/ghc/Makefile b/ghc/Makefile
index 4735e3b..0c0f3ec 100644 (file)
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -73,6 +73,10 @@ CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
 
+CONFIGURE_FLAGS_STAGE1 += $(foreach flag, $(GhcStage1HcOpts), --ghc-option=$(flag))
+CONFIGURE_FLAGS_STAGE2 += $(foreach flag, $(GhcStage2HcOpts), --ghc-option=$(flag))
+CONFIGURE_FLAGS_STAGE3 += $(foreach flag, $(GhcStage3HcOpts), --ghc-option=$(flag))
+
 # Allow EXTRA_HC_OPTS to be used from the command line to add options 
 # when building (e.g. -v)
 BUILD_FLAGS=$(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
@@ -127,9 +131,12 @@ install:
                           --distpref dist-stage2                         \
                           $(INSTALL_FLAGS)
 
+html:
+       @:
+
 install-docs:
        @:
 
 include $(TOP)/mk/bindist.mk
-EXE_DIST_DIR = dist-stage$(stage)
+EXE_DIST_DIR = dist-stage2