From 454a6639c66bfbe203c2540f950f6c5fa487964c Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 19 Aug 2011 19:58:56 +0000
Subject: [PATCH] tools: haddock rules fix

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e13809bae..cc19c525a 100644
--- a/Makefile
+++ b/Makefile
@@ -316,7 +316,7 @@ doctest: tools/doctest
 
 # make sure we have no haddock errors
 haddocktest:
-	@(make --quiet codehaddock \
+	@(make --quiet haddock \
 		&& echo $@ PASSED) || echo $@ FAILED
 
 # needs updating
@@ -533,8 +533,10 @@ HADDOCK=haddock --optghc='-hide-package monads-tf' --no-warnings --prologue .had
 	cat $< | perl -ne 'print if (/^description:/../^$$/)' | sed -e 's/^description: *//' >$@
 	printf "\nThis haddock covers all hledger-* packages, for individual package haddocks see hackage.\n" >>$@
 
+haddock: apihaddock internalhaddock
+
 # generate external api docs for the whole project
-apihaddock haddock: linkhledgerwebdir .haddockprologue
+apihaddock: linkhledgerwebdir .haddockprologue
 	$(HADDOCK) --title "hledger API docs (all packages)" \
 	 -o site/api-doc \
 	 --html \