diff options
| author | Austin Seipp <aseipp@pobox.com> | 2014-02-20 07:15:32 -0600 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-02-20 07:16:51 -0600 |
| commit | beac5252d444bafb0722bc6d13c6dd2d49a12070 (patch) | |
| tree | a9c54e76c5729bbea1825a4bec1260edcb2b6352 /rules | |
| parent | 5075c191a7640745e7f564082d3e27ee2ca8c2b9 (diff) | |
| download | haskell-beac5252d444bafb0722bc6d13c6dd2d49a12070.tar.gz | |
Fix installation of ghc-split (#8760)
The rules weren't correctly setting INSTALL_TOPDIRS, and on top of that
the dependencies were wrong when BINDIST=YES.
Authored-by: Evan Hauck <khyperia@live.com>
Authored-by: Austin Seipp <austin@well-typed.com>
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-perl.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/rules/build-perl.mk b/rules/build-perl.mk index 994c765cb7..3f7a0269d1 100644 --- a/rules/build-perl.mk +++ b/rules/build-perl.mk @@ -56,7 +56,6 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" "" ifneq "$$(BINDIST)" "YES" $1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$$$(unlit_INPLACE) | $$$$(dir $$$$@)/. "$$(unlit_INPLACE)" $$(UNLIT_OPTS) $$< $$@ -endif $1/$2/$$($1_$2_PROG): $1/$2/$$($1_$2_PROG).prl $$(call removeFiles,$$@) @@ -70,6 +69,15 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) | $$$$(dir $$$$@)/. $$(EXECUTABLE_FILE) $$@ endif +endif + +ifeq "$$($1_$2_INSTALL)" "YES" +ifeq "$$($1_$2_TOPDIR)" "YES" +INSTALL_TOPDIRS += $$($1_$2_INPLACE) +else +INSTALL_BINS += $$($1_$2_INPLACE) +endif +endif $(call profEnd, build-perl($1,$2)) endef |