Only pass --with-hscolour to cabal-bin once

diff --git a/libraries/Makefile b/libraries/Makefile
index 46e90d9..8ccba2c 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -134,10 +134,6 @@ 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:

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index d07244b..a581582 100644 (file)
--- a/mk/cabal-flags.mk
+++ b/mk/cabal-flags.mk
@@ -29,8 +29,8 @@ 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)" ""