Fix scoped type variables for expression type signatures

[ghc-hetmet.git] / mk / package.mk

diff --git a/mk/package.mk b/mk/package.mk
index 1cd090a..22bfdd0 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -119,8 +119,8 @@ boot all :: $(STAMP_PKG_CONF)
 endif
 
 $(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed
-       $(GHC_PKG_INPLACE) --force --update-package <package.conf.inplace
-       $(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --force --update-package <package.conf.installed
+       $(GHC_PKG_INPLACE) update - --force-files <package.conf.inplace
+       $(GHC_PKG_INPLACE) update - -f $(GHC_DRIVER_DIR)/package.conf --force-files <package.conf.installed
        @touch $(STAMP_PKG_CONF)
 
 CLEAN_FILES += package.conf.installed package.conf.inplace 
@@ -375,22 +375,29 @@ html :: $(HTML_DOC)
 extraclean :: 
        $(RM) -rf $(HTML_DIR)
 
+ifneq "$(findstring $(PACKAGE), $(CorePackages))" ""
+HaddockSourceURL = $(CorePackageSourceURL)
+else
+HaddockSourceURL = $(ExtraPackageSourceURL)
+endif
+
 $(HTML_DOC) : $(HS_PPS)
        @$(INSTALL_DIR) $(HTML_DIR)
        $(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
                --package=$(PACKAGE) \
                --dump-interface=$(PACKAGE).haddock \
                --use-index=../doc-index.html --use-contents=../index.html \
+               --source-module=$(HaddockSourceURL) \
                $(foreach pkg, $(PACKAGE_DEPS), \
                   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
 
 CLEAN_FILES += $(PACKAGE).haddock
 
 %.raw-hs : %.lhs
-       $(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+       $(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
 
 %.raw-hs : %.hs
-       $(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+       $(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
 
 HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
 #  NOT the same as HTML_DIR_INSTALLED when BIN_DIST is on