X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2FMakefile;h=c75e6705089dd16c056253ba24b9a4428c85418a;hb=60b50498ce499e879cd7d72f5386c1c633c692ff;hp=82eec81756cb63d17266d0578d7c98d99209e12e;hpb=f893fb935d23418b80534b05f35fe50d54af0acc;p=ghc-hetmet.git

diff --git a/utils/Makefile b/utils/Makefile
index 82eec81..c75e670 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -42,11 +42,6 @@ endif
 #  unlikely to want it desperately.  It is easy to build once you have
 #  a Haskell compiler and if you want it.
 
-binary-dist:
-	$(INSTALL_DIR)           $(BIN_DIST_DIR)/utils
-	$(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/
-	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist; done
-
 include $(TOP)/mk/target.mk
 
 # genprimopcode is needed to boot in ghc/compiler...
@@ -57,7 +52,7 @@ endif
 
 WITH_BOOTSTRAPPING_COMPILER = installPackage ghc-pkg hsc2hs hpc
 
-WITH_STAGE1 = installPackage ghc-pkg hasktags runghc hpc
+WITH_STAGE1 = installPackage ghc-pkg hasktags runghc hpc pwd
 ifneq "$(NO_INSTALL_HSC2HS)" "YES"
 WITH_STAGE1 += hsc2hs
 endif
@@ -65,8 +60,14 @@ endif
 # sort removes duplicates - we don't actually care about the order
 WITH_EITHER = $(sort $(WITH_BOOTSTRAPPING_COMPILER) $(WITH_STAGE1))
 
+binary-dist: $(foreach P,$(WITH_STAGE1),binary-dist.$P)
+	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:: $(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)
 
@@ -78,6 +79,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
@@ -90,3 +95,7 @@ $(foreach P,$(WITH_STAGE1),install.$P): \
 install.%:
 	$(MAKE) -C $* install
 
+$(foreach P,$(WITH_STAGE1),binary-dist.$P): \
+binary-dist.%:
+	$(MAKE) -C $* binary-dist WHERE_AM_I=$(WHERE_AM_I)/$*
+