diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-09-03 23:19:21 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-09-03 23:19:21 +0000 |
| commit | 897a7d971b52905529624d79d7efe39afcc964de (patch) | |
| tree | 00252f5b4bab6f051bcfa9fb4d3851fd3ed7ec66 | |
| parent | dbd4b5697ca01d0c629511b9ff533fd487a2e919 (diff) | |
| download | haskell-897a7d971b52905529624d79d7efe39afcc964de.tar.gz | |
Don't haddock packages that we aren't going to install
| -rw-r--r-- | ghc.mk | 6 | ||||
| -rw-r--r-- | rules/build-package.mk | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -312,6 +312,10 @@ define addPackage # args: $1 = package, $2 = condition endif 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)) ifeq "$(CLEANING)" "YES" $(eval $(call addPackage,integer-gmp)) @@ -897,7 +901,7 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe endif -INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string xhtml,$(PACKAGES)) +INSTALLED_PACKAGES := $(filter-out $(INTREE_ONLY_PACKAGES),$(PACKAGES)) ifeq "$(InstallExtraPackages)" "NO" INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES)) endif diff --git a/rules/build-package.mk b/rules/build-package.mk index 5a589f456f..cd02646884 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -161,7 +161,9 @@ $$(foreach way,$$($1_$2_WAYS),$$(eval \ $$(call build-package-way,$1,$2,$$(way),$3) \ )) +ifneq "$$($1_$2_HADDOCK_ME)" "NO" $(call haddock,$1,$2) +endif endif # package-data.mk exists |