X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fcabal-flags.mk;h=a58158207dc58e8849b15bce81efe80d2317942c;hb=0bc0144c2b982da47af56037bd2e3eac84e9560e;hp=e1ef084b46c124fff4d267bcb592276dd10b8fba;hpb=a7ccc4e6878c9256d4634a91776f2f09ad60b117;p=ghc-hetmet.git

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index e1ef084..a581582 100644
--- a/mk/cabal-flags.mk
+++ b/mk/cabal-flags.mk
@@ -29,20 +29,20 @@ COMMON_CONFIGURE_FLAGS =          \
     --with-ld=$(LD)               \
     $(addprefix --hsc2hs-option=,$(SRC_HSC2HS_OPTS))
 
-ifneq "$(HSCOLOUR)" ""
-COMMON_CONFIGURE_FLAGS += --with-hscolour=$(HSCOLOUR)
+ifeq "$(HSCOLOUR_SRCS)" "YES"
+CONFIGURE_OPTS += --with-hscolour="$(HSCOLOUR)"
 endif
 
 ifneq "$(ALEX)" ""
-COMMON_CONFIGURE_FLAGS += --with-alex=$(ALEX)
+COMMON_CONFIGURE_FLAGS += --with-alex="$(ALEX)"
 endif
 
 ifneq "$(HAPPY)" ""
-COMMON_CONFIGURE_FLAGS += --with-happy=$(HAPPY)
+COMMON_CONFIGURE_FLAGS += --with-happy="$(HAPPY)"
 endif
 
 COMMON_CONFIGURE_FLAGS += $(FLAGGED_CONFIGURE_ARGS) \
-                          --configure-option=--with-cc=$(CC)
+                          --configure-option=--with-cc="$(CC)"
 
 COMMON_CONFIGURE_FLAGS += $(shell [ -f $(HSC2HS_INPLACE) ] && \
                                   echo --with-hsc2hs=$(HSC2HS_INPLACE) )