ghc_ge_605 is now always YES

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 20a7678..5110687 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -116,12 +116,6 @@ subdirs:
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
 CABAL_GHC_FLAGS = -Wall
-ifeq "$(ghc_ge_605)" "NO"
-CABAL_GHC_FLAGS += -cpp
-endif
-
-# Euch, hideous hack:
-CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g')
 
 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
 
@@ -286,9 +280,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
@@ -366,7 +361,7 @@ endif
        echo $(WHERE_AM_I)/ifBuildable/ifBuildable >> $(BIN_DIST_LIST)
        for FILE in dph/dph-prim-interface/interface/*.h dph/dph/LICENSE; do if [ -f $$FILE ]; then echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); fi; done
 ifeq "$(HADDOCK_DOCS)" "YES"
-       for FILE in gen_contents_index prologue index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done
+       for FILE in gen_contents_index prologue.txt index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done
 endif
 
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \