X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=67d1831eb422fdcee5697f9553d03ca2b2754339;hb=39253008705e3ca590afdfa1b87bfbb5a16da7e7;hp=9c9e7e2021d95a649fea66d3a2fcf02d4a34b306;hpb=cc6b470ed8fe0494148b1629f30d7ae878ee25be;p=ghc-hetmet.git

diff --git a/rules/build-package.mk b/rules/build-package.mk
index 9c9e7e2..67d1831 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -39,25 +39,24 @@ endif
 
 # We don't install things compiled by stage 0, so no need to put them
 # in the bindist.
-ifneq "$(BINDIST) $3" "YES 0"
+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
 
-$(call clean-target,$1,$2,$1/$2)
-
 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
 
@@ -79,7 +78,7 @@ endif
 
 $(call all-target,$1_$2,$1/$2/package-data.mk)
 
-ifneq "$(BINDIST)" "YES"
+ifneq "$$(BINDIST)" "YES"
 # We have a rule for package-data.mk only when the package is
 # disabled, because we want the build to fail if we haven't run phase 0.
 $(call build-package-data,$1,$2)
@@ -145,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