X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-perl.mk;h=86f729fbb1151dba92b64806e07a6b535cb92d5d;hb=22b7fd79aeafa9a6b58f8448633197e00cec3962;hp=8e31b892756f456ad73840783fb7a9e8f61072a0;hpb=c59c053f0b8613dd128297ee0b6eef31f001c498;p=ghc-hetmet.git

diff --git a/rules/build-perl.mk b/rules/build-perl.mk
index 8e31b89..86f729f 100644
--- a/rules/build-perl.mk
+++ b/rules/build-perl.mk
@@ -22,8 +22,8 @@ define build-perl
 # $1 = dir
 # $2 = distdir
 
-ifeq "$$($1_$2_LIBEXEC)" "YES"
-$1_$2_INPLACE = $(INPLACE_LIB)/$$($1_$2_PROG)
+ifeq "$$($1_$2_TOPDIR)" "YES"
+$1_$2_INPLACE = $(INPLACE_TOPDIR)/$$($1_$2_PROG)
 else
 $1_$2_INPLACE = $(INPLACE_BIN)/$$($1_$2_PROG)
 endif
@@ -34,24 +34,25 @@ $(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
-	$$(RM) -f $$@
-	$$(UNLIT) $$(UNLIT_OPTS) $$< $$@
+	"$$(MKDIRHIER)" $1/$2
+	"$$(UNLIT)" $$(UNLIT_OPTS) $$< $$@
 
 $1/$2/$$($1_$2_PROG): $1/$2/$$($1_$2_PROG).prl
-	$$(RM) -f $$@
+	"$$(RM)" $$(RM_OPTS) $$@
 	echo '#!$$(PERL)'                                  >> $$@
 	echo '$$$$TARGETPLATFORM  = "$$(TARGETPLATFORM)";' >> $$@
 	cat $$<                                            >> $$@
 	$$(EXECUTABLE_FILE) $$@
 
 $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG)
-	$$(MKDIRHIER) $$(dir $$@)
-	$$(RM) -f $$@
-	$$(CP) $$< $$@
+	"$$(MKDIRHIER)" $$(dir $$@)
+	"$$(CP)" $$< $$@
 	$$(EXECUTABLE_FILE) $$@
 endif
+endif
 
 endef