Don't fail if libraries/bootstrapping already exists

[ghc-hetmet.git] / utils / Makefile

diff --git a/utils/Makefile b/utils/Makefile
index 6dc6838..06fa262 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -52,7 +52,7 @@ endif
 
 WITH_BOOTSTRAPPING_COMPILER = installPackage ghc-pkg hsc2hs hpc
 
-WITH_STAGE1 = installPackage ghc-pkg hasktags runghc hpc pwd
+WITH_STAGE1 = installPackage ghc-pkg hasktags runghc hpc pwd haddock
 ifneq "$(NO_INSTALL_HSC2HS)" "YES"
 WITH_STAGE1 += hsc2hs
 endif
@@ -61,10 +61,16 @@ endif
 WITH_EITHER = $(sort $(WITH_BOOTSTRAPPING_COMPILER) $(WITH_STAGE1))
 
 binary-dist: $(foreach P,$(WITH_STAGE1),binary-dist.$P)
+ifeq "$(WHERE_AM_I)" ""
+       echo "I don't know where I am" >&2
+       exit 1
+endif
        echo $(WHERE_AM_I)/Makefile >> $(BIN_DIST_LIST)
        set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist WHERE_AM_I=$(WHERE_AM_I)/$$d; done
 
-clean distclean:: $(foreach P,$(WITH_EITHER),clean.$P)
+clean:: $(foreach P,$(WITH_EITHER),clean.$P)
+
+distclean:: $(foreach P,$(WITH_EITHER),distclean.$P)
 
 with-bootstrapping-compiler: \
     $(foreach P,$(WITH_BOOTSTRAPPING_COMPILER),with-bootstrapping-compiler.$P)
@@ -77,6 +83,10 @@ $(foreach P,$(WITH_EITHER),clean.$P): \
 clean.%:
        $(MAKE) -C $* clean
 
+$(foreach P,$(WITH_EITHER),distclean.$P): \
+distclean.%:
+       $(MAKE) -C $* distclean
+
 $(foreach P,$(WITH_BOOTSTRAPPING_COMPILER),with-bootstrapping-compiler.$P): \
 with-bootstrapping-compiler.%:
        $(MAKE) -C $* with-bootstrapping-compiler