X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=1a45caa92046e9065c93433da99daa2ea18be357;hp=199e07ae9eb682b5a14eed8c1509a67c666ef2cd;hb=e9b68a09e815946e9d6b6606f80e43d582cf098d;hpb=6e9db31207f1bdc5fe2310d2e91664640a21c679

diff --git a/ghc.mk b/ghc.mk
index 199e07a..1a45caa 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -153,6 +153,7 @@ endif
 # -----------------------------------------------------------------------------
 # Utility definitions
 
+include rules/trace.mk
 include rules/make-command.mk
 
 # -----------------------------------------------------------------------------
@@ -739,7 +740,9 @@ $(foreach pkg,$(BOOT_PKGS),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBo
 GHCI_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_GHCI_LIB)) \
 	    $(compiler_stage2_GHCI_LIB)
 
+ifeq "$(UseArchivesForGhci)" "NO"
 ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(GHCI_LIBS)
+endif
 
 endif
 
@@ -786,8 +789,10 @@ TAGS: TAGS_compiler
 # Installation
 
 install: install_packages install_libs install_libexecs install_headers \
-         install_libexec_scripts install_bins install_docs \
-		 install_topdirs
+         install_libexec_scripts install_bins install_topdirs
+ifeq "$(HADDOCK_DOCS)" "YES"
+install: install_docs
+endif
 
 install_bins: $(INSTALL_BINS)
 	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"