X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2FMakefile;h=881d7d50b9076e3de9f24b9999d7964ba0ce5186;hb=04a0cea56816d1d9a2407c1c087bd864785aa44d;hp=660f1799d87084c1527454f2e67fff6854e3ffce;hpb=d1876c6ae9cf821685a7035bea728f9fb1b12899;p=ghc-hetmet.git

diff --git a/utils/Makefile b/utils/Makefile
index 660f179..881d7d5 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -29,7 +29,6 @@ endif
 # Utils that are old and/or bitrotted:
 #	stat2resid
 #	debugNCG
-#	ext-core
 #	genargs
 #	heap-view
 #	pvm
@@ -69,6 +68,11 @@ endif
 # sort removes duplicates - we don't actually care about the order
 WITH_EITHER = $(sort $(WITH_BOOTSTRAPPING_COMPILER) $(WITH_STAGE2))
 
+# We need to build pwd with stage 2, as it goes in bindists, but we
+# don't actually want to install it. Likewise the installPackage
+# program.
+DO_NOT_INSTALL = pwd installPackage
+
 binary-dist: $(foreach P,$(WITH_STAGE2),binary-dist.$P)
 ifeq "$(WHERE_AM_I)" ""
 	echo "I don't know where I am" >&2
@@ -87,7 +91,7 @@ with-bootstrapping-compiler: \
 with-stage-2: $(foreach P,$(WITH_STAGE2),with-stage-2.$P)
 	$(MAKE) -C haddock install-inplace
 
-install:: $(foreach P,$(WITH_STAGE2),install.$P)
+install:: $(foreach P,$(filter-out $(DO_NOT_INSTALL),$(WITH_STAGE2)),install.$P)
 
 $(foreach P,$(WITH_EITHER),clean.$P): \
 clean.%: