X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=18701532ca38478a03fed13250eb8eeb08072156;hb=7583384214ed6aa4a90d77c5975728a9b06149f2;hp=407cea60176ab3e8e910f89a41a1c6af31858e15;hpb=e48d901d2e723c1b24b86c4755b948e70506f990;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 407cea6..1870153 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -188,6 +188,7 @@ CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2)
 CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
+CONFIGURE_FLAGS_STAGE3 += --package-db $(STAGE3_PACKAGE_CONF)
 
 # In a source dist we don't need to worry about Parser.y(.pp) as we have
 # the .hs file pre-generated
@@ -212,7 +213,9 @@ build.stage.%:
 
 doc.stage.%:
 	$(CABAL) haddock --distpref dist-stage$* \
+					 --html-location='../$$pkg' \
 	                 --haddock-option=--optghc=-DSTAGE=$* \
+	                 --haddock-option=+RTS --haddock-option=-s --haddock-option=-c --haddock-option=-RTS \
 	                 --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
 
 install:
@@ -243,7 +246,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
 	@echo "cHscIfaceFileVersion  :: String" >> $(CONFIG_HS)
 	@echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
 	@echo "cSplitObjs            :: String" >> $(CONFIG_HS)
-	@echo "cSplitObjs            = \"$(SplitObjs)\"" >> $(CONFIG_HS)
+	@echo "cSplitObjs            = \"$(SupportsSplitObjs)\"" >> $(CONFIG_HS)
 	@echo "cGhcWithInterpreter   :: String" >> $(CONFIG_HS)
 	@echo "cGhcWithInterpreter   = \"$(GhcWithInterpreter)\"" >> $(CONFIG_HS)
 	@echo "cGhcWithNativeCodeGen :: String" >> $(CONFIG_HS)
@@ -486,9 +489,12 @@ LIB_DIST_DIR = dist-stage2
 
 #-----------------------------------------------------------------------------
 # etags generation
-
-GHCTAGS = $(TOP)/utils/ghctags/ghctags
-GHCTAGS_ROOT = main/GHC.hs
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+GHCTAGS = $(TOP)/utils/ghctags/ghctags.exe
+else
+GHCTAGS = $(TOP)/utils/ghctags/ghctags-inplace
+endif
+GHCTAGS_ROOT = main/GHC.hs ghci/InteractiveUI.hs main/PprTyThing.hs
 
 # etags for stage2 is actually broken since it requires building
 # ghctags against an older ghc api