Changes for the new IO library, mainly base-package modules moving around

[ghc-hetmet.git] / rules / build-package.mk

diff --git a/rules/build-package.mk b/rules/build-package.mk
index b5a1239..67d1831 100644 (file)
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -39,7 +39,7 @@ 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)
@@ -55,8 +55,8 @@ 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
 
@@ -78,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)