From 1db693badb37e35cb6ed0170e931d61b5234e863 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 27 Aug 2008 18:27:31 +0000 Subject: [PATCH] When haddocking the libraries, tell Cabal where haddock is We can't do it when configuring, because we haven't built haddock yet --- libraries/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/Makefile b/libraries/Makefile index a2729dc..7459bc5 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -295,8 +295,9 @@ doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)) # Making hyperlinked source only works if we have hscolour ifneq "$(HSCOLOUR)" "" -CABAL_HADDOCK_FLAGS=--hyperlink-source +CABAL_HADDOCK_FLAGS += --hyperlink-source endif +CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_ABS_TOP)/utils/haddock/install-inplace/bin/haddock $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ -- 1.7.10.4