X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;fp=libraries%2FMakefile;h=928871a658719782e5f6657f7fa0488bb8395c94;hp=5110687c6e9822cb0791c773bb2803410422a559;hb=9efc323b5b57a0b4d50008c942a90a45dc51ee2d;hpb=70f981b9dc28d94748ce91469df5bc12f0c6c60c

diff --git a/libraries/Makefile b/libraries/Makefile
index 5110687..928871a 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -108,6 +108,10 @@ CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
+ifeq "$(HSCOLOUR_SRCS)" "YES"
+CONFIGURE_OPTS += --with-hscolour="$(HSCOLOUR)"
+endif
+
 .PHONY: subdirs
 
 subdirs:
@@ -253,7 +257,7 @@ doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR))
 	sh gen_contents_index --inplace
 
 # Making hyperlinked source only works if we have hscolour
-ifneq "$(HSCOLOUR)" ""
+ifeq "$(HSCOLOUR_SRCS)" "YES"
 CABAL_HADDOCK_FLAGS += --hyperlink-source
 endif
 CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock