X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=7541a87d409b3ec04f6a14a8737d169b8477f528;hb=fd274ffd311d18d6cfb8ecfdf492eff3576620cc;hp=5952bee77315a34b19e1e83a9aa5d203723c4157;hpb=a3306fa97577f3809b0fcaefb49b427ba94f06a8;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 5952bee..7541a87 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -317,7 +317,6 @@ $(eval $(call addPackage,extensible-exceptions))
 $(eval $(call addPackage,haskell98))
 $(eval $(call addPackage,hpc))
 $(eval $(call addPackage,pretty))
-$(eval $(call addPackage,syb))
 $(eval $(call addPackage,template-haskell))
 $(eval $(call addPackage,Cabal))
 $(eval $(call addPackage,binary))
@@ -494,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 += \
@@ -807,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