From: Simon Marlow <marlowsd@gmail.com>
Date: Tue, 16 Jun 2009 08:44:51 +0000 (+0000)
Subject: eliminate "warning: overriding commnds..." from make when we're cleaning
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=39253008705e3ca590afdfa1b87bfbb5a16da7e7

eliminate "warning: overriding commnds..." from make when we're cleaning
---

diff --git a/rules/build-perl.mk b/rules/build-perl.mk
index 468572c..5740676 100644
--- a/rules/build-perl.mk
+++ b/rules/build-perl.mk
@@ -34,6 +34,8 @@ $(call clean-target,$1,$2,$1/$2 $$($1_$2_INPLACE))
 .PHONY: clean_$1
 clean_$1 : clean_$1_$2
 
+# INPLACE_BIN etc. might be empty if we're cleaning
+ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 ifneq "$$(BINDIST)" "YES"
 $1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$(UNLIT)
 	"$$(MKDIRHIER)" $1/$2
@@ -53,5 +55,6 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG)
 	"$$(CP)" $$< $$@
 	$$(EXECUTABLE_FILE) $$@
 endif
+endif
 
 endef
diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 321de02..6910e8f 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -137,7 +137,7 @@ $(call all-target,$1_$2,$$($1_$2_INPLACE))
 $(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE))
 
 # INPLACE_BIN might be empty if we're distcleaning
-ifneq "$$(INPLACE_BIN)" ""
+ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) $$(MKDIRHIER)
 	"$$(MKDIRHIER)" $$(dir $$@)
 	"$$(CP)" -p $$< $$@