-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
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)