Clean the bootstrapping extensible-exceptions package

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index d122031..624427f 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -120,9 +120,6 @@ 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
 
 .PHONY: boot
@@ -135,6 +132,10 @@ cabal-bin: cabal-bin.hs
 
 bootstrapping.conf: cabal-bin
        echo "[]" > $@.tmp
+       -cd extensible-exceptions && $(CABAL) clean     --distpref=dist-bootstrapping
+       cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+       cd extensible-exceptions && $(CABAL) build     --distpref=dist-bootstrapping
+       cd extensible-exceptions && $(CABAL) install   --distpref=dist-bootstrapping --inplace
        -cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
        cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
        cd filepath && $(CABAL) build     --distpref=dist-bootstrapping
@@ -276,14 +277,16 @@ ifneq "$(HSCOLOUR)" ""
        if $(IFBUILDABLE) $* && [ -d $*/dist/doc/html/*/src/ ]; then cp hscolour.css $*/dist/doc/html/*/src/; fi
 endif
 
-.PHONY: distclean clean clean.library.%
+.PHONY: maintainer-clean distclean clean clean.library.%
 
+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
@@ -296,7 +299,7 @@ ifneq "$(wildcard dph)" ""
        $(MAKE) -C dph clean
 endif
 
-distclean:
+maintainer-clean distclean:
        $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak)
 
 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
@@ -316,6 +319,7 @@ ifeq "$(HADDOCK_DOCS)" "YES"
        $(INSTALL_DIR)                                                     $(DESTDIR)$(html_installed_root)
        $(INSTALL_DATA)   index.html doc-index*.html                       $(DESTDIR)$(html_installed_root)
        $(INSTALL_SCRIPT) gen_contents_index                               $(DESTDIR)$(html_installed_root)
+       $(INSTALL_DATA)   prologue.txt                                     $(DESTDIR)$(html_installed_root)
        # Hacks:
        $(INSTALL_DATA)   base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root)
        $(INSTALL_DATA)   base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root)
@@ -360,7 +364,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 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)): \