diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-01-04 21:46:47 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-01-04 21:46:47 +0000 |
| commit | 9efc323b5b57a0b4d50008c942a90a45dc51ee2d (patch) | |
| tree | aec496aa4611e8d70b0acb5060ea8dc362025d59 /libraries | |
| parent | 70f981b9dc28d94748ce91469df5bc12f0c6c60c (diff) | |
| download | haskell-9efc323b5b57a0b4d50008c942a90a45dc51ee2d.tar.gz | |
Require HsColour by default
This should stop us ending up without HsColour'ed sources on some
platforms.
We also now tell Cabal where to find HsColour, rather than it finding
it itself.
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index 5110687c6e..928871a658 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 |