X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-perl.mk;h=669f3d7be4fc7c6a74e2457057991a7f84ba3a76;hb=60762c678c83e370609001addc8f52efcd657139;hp=57406766ca1f020a442ea57cd0ce7f99a25eec7c;hpb=39253008705e3ca590afdfa1b87bfbb5a16da7e7;p=ghc-hetmet.git diff --git a/rules/build-perl.mk b/rules/build-perl.mk index 5740676..669f3d7 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 @@ -37,9 +37,7 @@ 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)" $$(RM_OPTS) $$@ +$1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$(UNLIT) | $$$$(dir $$$$@)/. "$$(UNLIT)" $$(UNLIT_OPTS) $$< $$@ $1/$2/$$($1_$2_PROG): $1/$2/$$($1_$2_PROG).prl @@ -49,9 +47,7 @@ $1/$2/$$($1_$2_PROG): $1/$2/$$($1_$2_PROG).prl cat $$< >> $$@ $$(EXECUTABLE_FILE) $$@ -$$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) - "$$(MKDIRHIER)" $$(dir $$@) - "$$(RM)" $$(RM_OPTS) $$@ +$$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) | $$$$(dir $$$$@)/. "$$(CP)" $$< $$@ $$(EXECUTABLE_FILE) $$@ endif