X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=711e56cf76fc090c6d1cb359b64565f7eec3abc2;hb=fce6c28071259f68ec0be5bb53abd2ee36123e92;hp=fb7d9d230cf497a443d0fe3c68205b1fb19aa6f2;hpb=442f06cc8f9f729d33a8de3aa14cdaf80545808e;p=ghc-hetmet.git

diff --git a/rules/build-package.mk b/rules/build-package.mk
index fb7d9d2..711e56c 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -42,15 +42,21 @@ endif
 ifneq "$(BINDIST) $3" "YES 0"
 
 $(call all-target,$1,all_$1_$2)
-
 $(call clean-target,$1,$2,$1/$2)
+# This give us things like
+#     all_libraries: all_libraries/base_dist-install
+ifneq "$$($1_$2_GROUP)" ""
+all_$$($1_$2_GROUP): all_$1_$2
+endif
 
 distclean : clean_$1_$2_config
 
+maintainer-clean : distclean
+
 .PHONY: clean_$1_$2_config
 clean_$1_$2_config:
-	$(RM) $1/config.log $1/config.status $1/include/Hs*Config.h
-	$(RM) -r $1/autom4te.cache
+	"$$(RM)" $$(RM_OPTS) $1/config.log $1/config.status $1/include/Hs*Config.h
+	"$$(RM)" $$(RM_OPTS) -r $1/autom4te.cache
 
 # --- CONFIGURATION
 
@@ -138,7 +144,7 @@ $(call haddock,$1,$2)
 endif # package-data.mk exists
 
 # Don't put bootstrapping packages in the bindist
-ifeq "$3" "1"
+ifneq "$3" "0"
 BINDIST_EXTRAS += $1/*.cabal $1/$2/setup-config $1/LICENSE
 BINDIST_EXTRAS += $$($1_$2_INSTALL_INCLUDES_SRCS)
 endif