projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing import sm_mutex, which fixes the -fvia-c build
[ghc-hetmet.git]
/
rules
/
build-perl.mk
diff --git
a/rules/build-perl.mk
b/rules/build-perl.mk
index
5740676
..
f3ea2b6
100644
(file)
--- a/
rules/build-perl.mk
+++ b/
rules/build-perl.mk
@@
-22,13
+22,13
@@
define build-perl
# $1 = dir
# $2 = distdir
# $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
else
-$1_$2_INPLACE = $(INPLACE_BIN)/$$($1_$2_PROG)
+$1_$2_INPLACE = $$(INPLACE_BIN)/$$($1_$2_PROG)
endif
endif
-$(call all-target,$$($1_$2_INPLACE))
+$(call all-target,$1_$2,$$($1_$2_INPLACE))
$(call clean-target,$1,$2,$1/$2 $$($1_$2_INPLACE))
.PHONY: clean_$1
$(call clean-target,$1,$2,$1/$2 $$($1_$2_INPLACE))
.PHONY: clean_$1
@@
-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"
# 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
"$$(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) $$@
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
"$$(CP)" $$< $$@
$$(EXECUTABLE_FILE) $$@
endif