X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fhaddock.mk;h=98838c969b902bafff6c92bf070a8c3872edf558;hb=3ddb6bb4edf70b2456d789f34d3f56541818a696;hp=67286f58207b4c4dd3e28547c22547afd9dcca05;hpb=fce6c28071259f68ec0be5bb53abd2ee36123e92;p=ghc-hetmet.git

diff --git a/rules/haddock.mk b/rules/haddock.mk
index 67286f5..98838c9 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -17,6 +17,7 @@ ifneq "$$($1_$2_DO_HADDOCK)" "NO"
 
 ifeq "$$($$($1_PACKAGE)_HADDOCK_FILE)" ""
 $$($1_PACKAGE)_HADDOCK_FILE = $1/$2/doc/html/$$($1_PACKAGE)/$$($1_PACKAGE).haddock
+ALL_HADDOCK_FILES += $$($$($1_PACKAGE)_HADDOCK_FILE)
 else
 $$(error Already got a haddock file for $$($1_PACKAGE))
 endif
@@ -24,22 +25,26 @@ endif
 haddock: $$($$($1_PACKAGE)_HADDOCK_FILE)
 
 ifeq "$$(HADDOCK_DOCS)" "YES"
-$(call all-target,$1_$2_haddock,$$($$($1_PACKAGE)_HADDOCK_FILE))
+$(call all-target,$1_$2_haddock,html_$1)
 endif
 
+.PHONY: html_$1
+html_$1 : $$($$($1_PACKAGE)_HADDOCK_FILE)
+
 $$($1_PACKAGE)_HADDOCK_DEPS = $$(foreach n,$$($1_$2_DEP_NAMES),$$($$n_HADDOCK_FILE))
 
 ifeq "$$(HSCOLOUR_SRCS)" "YES"
 $1_$2_HADDOCK_FLAGS += --hyperlink-source
 endif
 
-$$($$($1_PACKAGE)_HADDOCK_FILE) : $$(MKDIRHIER) $$(INPLACE_BIN)/haddock$$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$($$($1_PACKAGE)_HADDOCK_DEPS)
-	"$$(MKDIRHIER)" $$(dir $$@)
+ifneq "$$(BINDIST)" "YES"
+$$($$($1_PACKAGE)_HADDOCK_FILE) : $$(INPLACE_BIN)/haddock$$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$($$($1_PACKAGE)_HADDOCK_DEPS) | $$$$(dir $$$$@)/.
 	"$$(GHC_CABAL_INPLACE)" haddock $2 $1 --with-haddock=$$(TOP)/$$(INPLACE_BIN)/haddock --with-ghc=$$(TOP)/$$(INPLACE_BIN)/ghc-stage2 $$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS)
 
 # Make the haddocking depend on the library .a file, to ensure
 # that we wait until the library is fully build before we haddock it
 $$($$($1_PACKAGE)_HADDOCK_FILE) : $$($1_$2_v_LIB)
+endif
 
 endif