X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fhaddock.mk;h=3f37a6452b931a8790919fd10ad7b468d61b79d9;hb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b;hp=c87aa61b6269641f03a4e1ac85b8ce7f3d11dd9a;hpb=c778b9227fd06264ab7f58cc36da9d39690803a5;p=ghc-hetmet.git

diff --git a/rules/haddock.mk b/rules/haddock.mk
index c87aa61..3f37a64 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -34,8 +34,12 @@ $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 $$@)
-	$$(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)
+	"$$(MKDIRHIER)" $$(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