Commit 897a7d97 authored by Ian Lynagh's avatar Ian Lynagh

Don't haddock packages that we aren't going to install

parent dbd4b569
...@@ -312,6 +312,10 @@ define addPackage # args: $1 = package, $2 = condition ...@@ -312,6 +312,10 @@ define addPackage # args: $1 = package, $2 = condition
endif endif
endef endef
INTREE_ONLY_PACKAGES := haskeline mtl terminfo utf8-string xhtml
$(foreach p,$(INTREE_ONLY_PACKAGES),$(eval libraries/$p_dist-install_HADDOCK_ME = NO))
$(eval $(call addPackage,ghc-prim)) $(eval $(call addPackage,ghc-prim))
ifeq "$(CLEANING)" "YES" ifeq "$(CLEANING)" "YES"
$(eval $(call addPackage,integer-gmp)) $(eval $(call addPackage,integer-gmp))
...@@ -897,7 +901,7 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe ...@@ -897,7 +901,7 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
endif endif
INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string xhtml,$(PACKAGES)) INSTALLED_PACKAGES := $(filter-out $(INTREE_ONLY_PACKAGES),$(PACKAGES))
ifeq "$(InstallExtraPackages)" "NO" ifeq "$(InstallExtraPackages)" "NO"
INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES)) INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES))
endif endif
......
...@@ -161,7 +161,9 @@ $$(foreach way,$$($1_$2_WAYS),$$(eval \ ...@@ -161,7 +161,9 @@ $$(foreach way,$$($1_$2_WAYS),$$(eval \
$$(call build-package-way,$1,$2,$$(way),$3) \ $$(call build-package-way,$1,$2,$$(way),$3) \
)) ))
ifneq "$$($1_$2_HADDOCK_ME)" "NO"
$(call haddock,$1,$2) $(call haddock,$1,$2)
endif
endif # package-data.mk exists endif # package-data.mk exists
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment