X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpackage.mk;h=094b6a574851f46ef4e532ba1582266f8f18bcb7;hp=60507dbde344d1ca00b1d41301a295a4ca0365ef;hb=c1500e4888be2341c0b6e6897f494766c86feba0;hpb=47b417a518835b4e3b9d7a9a5bb6f1f0583e448d

diff --git a/mk/package.mk b/mk/package.mk
index 60507db..094b6a5 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -84,7 +84,7 @@ install::
 	       -x c $(PACKAGE_CPP_OPTS) package.conf.in \
 	    | grep -v '^#pragma GCC' \
 	    | sed -e 's/""//g' -e 's/:[   ]*,/: /g' \
-	    | $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace --global-conf $(DESTDIR)$(libdir)/package.conf update - --force
+	    | $(GHC_PKG_PROG) --global-conf $(DESTDIR)$(libdir)/package.conf update - --force
 
 # we could be more accurate here and add a dependency on
 # driver/package.conf, but that doesn't work too well because of
@@ -279,19 +279,13 @@ 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) \
+		--source-module=$(PackageSourceURL) \
 		$(foreach pkg, $(PACKAGE_DEPS), \
 		   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)