eliminate "warning: overriding commnds..." from make when we're cleaning
authorSimon Marlow <marlowsd@gmail.com>
Tue, 16 Jun 2009 08:44:51 +0000 (08:44 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Tue, 16 Jun 2009 08:44:51 +0000 (08:44 +0000)
rules/build-perl.mk
rules/build-prog.mk

index 468572c..5740676 100644 (file)
@@ -34,6 +34,8 @@ $(call clean-target,$1,$2,$1/$2 $$($1_$2_INPLACE))
 .PHONY: clean_$1
 clean_$1 : clean_$1_$2
 
 .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
 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
        "$$(CP)" $$< $$@
        $$(EXECUTABLE_FILE) $$@
 endif
+endif
 
 endef
 
 endef
index 321de02..6910e8f 100644 (file)
@@ -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
 $(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 $$< $$@
 $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) $$(MKDIRHIER)
        "$$(MKDIRHIER)" $$(dir $$@)
        "$$(CP)" -p $$< $$@