summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2010-06-02 09:01:01 +0000
committerSimon Marlow <marlowsd@gmail.com>2010-06-02 09:01:01 +0000
commit193f6ef106e2840882151ae9f33a02246e8ea047 (patch)
tree746e798e2d4bb479de3656ae377a348339fe7098 /ghc.mk
parentd529d596a1256bb48bda45ec343631c879c8d56d (diff)
downloadhaskell-193f6ef106e2840882151ae9f33a02246e8ea047.tar.gz
Add xhtml package (a new dependency of Haddock; not installed/shipped)
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/ghc.mk b/ghc.mk
index 4640b7f9ac..eaf0e29c0a 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -335,6 +335,7 @@ $(eval $(call addPackage,binary))
$(eval $(call addPackage,bin-package-db))
$(eval $(call addPackage,mtl))
$(eval $(call addPackage,utf8-string))
+$(eval $(call addPackage,xhtml))
$(eval $(call addPackage,terminfo,($$(Windows),NO)))
@@ -653,6 +654,9 @@ $(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS +=
libraries/binary_dist-install_HC_OPTS += -Wwarn
libraries/binary_dist-boot_HC_OPTS += -Wwarn
+# XXX hack: xhtml has warnings
+libraries/xhtml_dist-install_HC_OPTS += -Wwarn
+
# ----------------------------------------------
# A useful pseudo-target
.PHONY: stage1_libs
@@ -876,7 +880,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,$(PACKAGES))
+INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string xhtml,$(PACKAGES))
ifeq "$(InstallExtraPackages)" "NO"
INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES))
endif