X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=7541a87d409b3ec04f6a14a8737d169b8477f528;hb=6e998535044b9565b46d1d0d5453427c4051a7b4;hp=8267dea70d2d39c16ca4d87b9b17d1bd7d699901;hpb=0b00750febd6f39f6a00371c6b39d4e724b06411;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 8267dea..7541a87 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -493,9 +493,11 @@ BUILD_DIRS += \
    $(GHC_GENAPPLY_DIR)
 endif
 
+ifneq "$(HADDOCK_DOCS)" "NO"
 BUILD_DIRS += \
    utils/haddock \
    utils/haddock/doc
+endif
 
 ifneq "$(CLEANING)" "YES"
 BUILD_DIRS += \
@@ -806,13 +808,15 @@ install_packages: libffi/package.conf.install rts/package.conf.install
 		 $(INSTALLED_GHC_PKG_REAL) \
 		 $(DESTDIR)$(topdir) \
 		 libraries/$p dist-install \
-		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' &&) true
+		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
+		 $(RelocatableBuild) &&) true
 	"$(GHC_CABAL_INPLACE)" install \
 		 $(INSTALLED_GHC_REAL) \
 	 	 $(INSTALLED_GHC_PKG_REAL) \
 		 $(DESTDIR)$(topdir) \
 		 compiler stage2 \
-		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries'
+		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
+		 $(RelocatableBuild)
 
 # -----------------------------------------------------------------------------
 # Binary distributions