From c54391d98a59a35a8fe10225ddfe528094a82033 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 5 Mar 2009 13:27:23 +0000 Subject: [PATCH] By default, only HsColour the docs if we find HsColour. Fixes trac #3004. If you manually set HSCOLOUR_SRCS=YES then the build will fail if HsColour wasn't found. --- mk/config.mk.in | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mk/config.mk.in b/mk/config.mk.in index 5bcd5f9..6f16dd5 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -185,11 +185,6 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@ # XMLDocWays= -# Should we build haddock docs? -HADDOCK_DOCS = YES -# And HsColour the sources? -HSCOLOUR_SRCS = YES - # Should we build latex docs? LATEX_DOCS = NO @@ -1192,6 +1187,15 @@ ALEX_VERSION = @AlexVersion@ # GHC_ALEX_OPTS = -g +# Should we build haddock docs? +HADDOCK_DOCS = YES +# And HsColour the sources? +ifeq "$(HSCOLOUR)" "" +HSCOLOUR_SRCS = NO +else +HSCOLOUR_SRCS = YES +endif + # # Options for compiling in different `ways'. # -- 1.7.10.4