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.

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 5bcd5f9..6f16dd5 100644 (file)
--- 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'. 
 #