-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_INSTALL_PROG) --global-conf $(DESTDIR)$(datadir)/package.conf update - --force
+
+GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-pkg/ghc-pkg
# we could be more accurate here and add a dependency on
# driver/package.conf, but that doesn't work too well because of
ifneq "$(NO_SET_HC)" "YES"
HC = $(GHC_INPLACE)
+BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS =
endif
IGNORE_PACKAGE_FLAG = -package-name $(PACKAGE)-$(VERSION)
SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS))
endif
-# -fgenerics switches on generation of support code for
+# -XGenerics switches on generation of support code for
# derivable type classes. This is now off by default,
# but we switch it on for the libraries so that we generate
# the code in case someone importing wants it.
ifeq "$(NON_HS_PACKAGE)" ""
-SRC_HC_OPTS += -fgenerics
+SRC_HC_OPTS += -XGenerics
endif
ifndef LIBRARY
CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
-ifeq "$(HADDOCK)" ""
-html ::
- @echo Haddock must be installed in order to build HTML library documentation.
- @echo Please install Haddock and re-configure.
- @exit 1
-endif
-
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)
%.raw-hs : %.hs
$(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
-HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
+HTML_INSTALL_DIR = $(DESTDIR)$(htmldir)/libraries/html/$(PACKAGE)
install-docs :: $(HTML_DOC)
@$(INSTALL_DIR) $(HTML_INSTALL_DIR)