diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-12-17 19:45:13 +0100 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-12-17 20:10:18 +0100 |
| commit | c1bd3d444f8c52c688fdbea695ee0ae7f402945d (patch) | |
| tree | bfdb16aaa0e7c8a47591e01d1c4f89f3f3c51c75 /rules | |
| parent | 1722fa106e10e63160bb2322e2ccb830fd5b9ab3 (diff) | |
| download | haskell-c1bd3d444f8c52c688fdbea695ee0ae7f402945d.tar.gz | |
Build system: also put scripts in libexecdir/bin
This follows a similar change in
4905b83a2d448c65ccced385343d4e8124548a3b, where binaries are installed
in libexecdir/bin instead of libexecdir.
This fixes a problem with ghc not able to find ghc-split, when
SplitObjs=YES.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-perl.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/build-perl.mk b/rules/build-perl.mk index 5a1660c0d7..58660fcac3 100644 --- a/rules/build-perl.mk +++ b/rules/build-perl.mk @@ -36,7 +36,7 @@ ifneq "$$($$($1_$2_PROG)_INPLACE)" "" $$(error $$($1_$2_PROG)_INPLACE defined twice) endif ifeq "$$($1_$2_TOPDIR)" "YES" -$$($1_$2_PROG)_INPLACE = $$(INPLACE_TOPDIR)/$$($1_$2_PROG) +$$($1_$2_PROG)_INPLACE = $$(INPLACE_LIB)/bin/$$($1_$2_PROG) else $$($1_$2_PROG)_INPLACE = $$(INPLACE_BIN)/$$($1_$2_PROG) endif @@ -66,11 +66,11 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) | $$$$(dir $$$$@)/. endif ifeq "$$($1_$2_INSTALL)" "YES" -# Don't add to INSTALL_BINS or INSTAL_TOPDIR_BINS, because they will get +# Don't add to INSTALL_BINS or INSTALL_LIBEXECS, because they will get # stripped when calling 'make install-strip', and stripping a Perl script # doesn't work. ifeq "$$($1_$2_TOPDIR)" "YES" -INSTALL_TOPDIR_SCRIPTS += $$($1_$2_INPLACE) +INSTALL_LIBEXEC_SCRIPTS += $$($1_$2_INPLACE) else INSTALL_SCRIPTS += $$($1_$2_INPLACE) endif |