projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove "touch %_hsc.c" - what was it for?
[ghc-hetmet.git]
/
rules
/
build-prog.mk
diff --git
a/rules/build-prog.mk
b/rules/build-prog.mk
index
6910e8f
..
b975f49
100644
(file)
--- a/
rules/build-prog.mk
+++ b/
rules/build-prog.mk
@@
-66,7
+66,7
@@
$(call all-target,$1_$2,$1/$2/package-data.mk)
# We have a rule for package-data.mk only when the package is
# disabled, because we want the build to fail if we haven't run phase 0.
ifneq "$(BINDIST)" "YES"
# We have a rule for package-data.mk only when the package is
# disabled, because we want the build to fail if we haven't run phase 0.
ifneq "$(BINDIST)" "YES"
-$(call build-package-data,$1,$2)
+$(call build-package-data,$1,$2,$3)
endif
else
endif
else
@@
-83,10
+83,8
@@
$(call build-dependencies,$1,$2)
# --- IMPLICIT RULES
# --- IMPLICIT RULES
-$(call distdir-opts,$1,$2,$3)
-
# Just the 'v' way for programs
# Just the 'v' way for programs
-$(call distdir-way-opts,$1,$2,v)
+$(call distdir-way-opts,$1,$2,v,$3)
$(call c-suffix-rules,$1,$2,v,YES)
$(call c-suffix-rules,$1,$2,v,YES)
@@
-126,8
+124,8
@@
else
ifeq "$$($1_$2_SHELL_WRAPPER) $$(Windows)" "YES NO"
$1_$2_INPLACE = $$(INPLACE_LIB)/$$($1_$2_PROG)
else
ifeq "$$($1_$2_SHELL_WRAPPER) $$(Windows)" "YES NO"
$1_$2_INPLACE = $$(INPLACE_LIB)/$$($1_$2_PROG)
else
-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
else
$1_$2_INPLACE = $$(INPLACE_BIN)/$$($1_$2_PROG)
endif
@@
-150,8
+148,8
@@
endif
$(call shell-wrapper,$1,$2)
ifeq "$$($1_$2_INSTALL)" "YES"
$(call shell-wrapper,$1,$2)
ifeq "$$($1_$2_INSTALL)" "YES"
-ifeq "$$($1_$2_LIBEXEC)" "YES"
-INSTALL_LIBEXECS += $1/$2/build/tmp/$$($1_$2_PROG)
+ifeq "$$($1_$2_TOPDIR)" "YES"
+INSTALL_TOPDIRS += $1/$2/build/tmp/$$($1_$2_PROG)
else
INSTALL_BINS += $1/$2/build/tmp/$$($1_$2_PROG)
endif
else
INSTALL_BINS += $1/$2/build/tmp/$$($1_$2_PROG)
endif