summaryrefslogtreecommitdiff
path: root/rules/haddock.mk
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-05-14 01:08:48 +0100
committerIan Lynagh <ian@well-typed.com>2013-05-14 01:08:48 +0100
commitff1a16a0bd630f97dc507f96977eaaae9d8df9a6 (patch)
tree1396eed617fa2f380c7b2139cdf89f80fb2b9bbb /rules/haddock.mk
parentb8447a93b36d19f4c1dd81881ff10adf8c781fbe (diff)
downloadhaskell-ff1a16a0bd630f97dc507f96977eaaae9d8df9a6.tar.gz
Simplify ghc-cabal
It now consistently takes directory and distDirectory as its first 2 arguments. Also, it only supports configuring 1 package at a time now (we weren't using the ability to configure more than one at once).
Diffstat (limited to 'rules/haddock.mk')
-rw-r--r--rules/haddock.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/haddock.mk b/rules/haddock.mk
index bd4b994276..78f4ea6e18 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -45,7 +45,7 @@ ifneq "$$(BINDIST)" "YES"
# so we don't want to expand it yet.
$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) : $$$$(haddock_INPLACE) $$$$(ghc-cabal_INPLACE) $$($1_$2_HS_SRCS) $$$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_DEPS) | $$$$(dir $$$$@)/.
ifeq "$$(HSCOLOUR_SRCS)" "YES"
- "$$(ghc-cabal_INPLACE)" hscolour $2 $1
+ "$$(ghc-cabal_INPLACE)" hscolour $1 $2
endif
"$$(TOP)/$$(INPLACE_BIN)/haddock" \
--odir="$1/$2/doc/html/$$($1_PACKAGE)" \