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

diff --git a/compiler/Makefile b/compiler/Makefile
index 407cea6..b970c20 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -212,7 +212,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:
@@ -486,9 +488,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
 
 # etags for stage2 is actually broken since it requires building
 # ghctags against an older ghc api