X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=928871a658719782e5f6657f7fa0488bb8395c94;hb=2bfdf5035220814a8ed0688ac3c2cc44d911299f;hp=b0179cae318759d347b680f64fe9c24551bb7fef;hpb=7c9b541f7f321839ef06f22ebc24b53adc1cea7a;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index b0179ca..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:
@@ -116,9 +120,6 @@ subdirs:
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
 CABAL_GHC_FLAGS = -Wall
-ifeq "$(ghc_ge_605)" "NO"
-CABAL_GHC_FLAGS += -cpp
-endif
 
 BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc
 
@@ -256,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
@@ -283,9 +284,10 @@ maintainer-clean: clean
 distclean: clean
 
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
-	-cd filepath && $(CABAL) clean --distpref=dist-bootstrapping
-	-cd Cabal    && $(CABAL) clean --distpref=dist-bootstrapping
-	-cd hpc      && $(CABAL) clean --distpref=dist-bootstrapping
+	-cd extensible-exceptions && $(CABAL) clean --distpref=dist-bootstrapping
+	-cd filepath              && $(CABAL) clean --distpref=dist-bootstrapping
+	-cd Cabal                 && $(CABAL) clean --distpref=dist-bootstrapping
+	-cd hpc                   && $(CABAL) clean --distpref=dist-bootstrapping
 	$(RM) -rf bootstrapping
 	$(RM) -f bootstrapping.conf     bootstrapping.conf.old
 	$(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old