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 /ghc.mk | |
| 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 'ghc.mk')
| -rw-r--r-- | ghc.mk | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -851,7 +851,7 @@ TAGS: TAGS_compiler # Installation install: install_libs install_packages install_libexecs \ - install_bins install_topdirs + install_bins install_libexec_scripts ifeq "$(HADDOCK_DOCS)" "YES" install: install_docs endif @@ -910,14 +910,11 @@ ifeq "$(Windows_Host)" "NO" endif endif -install_topdirs: $(INSTALL_TOPDIR_BINS) $(INSTALL_TOPDIR_SCRIPTS) - $(INSTALL_DIR) "$(DESTDIR)$(topdir)" - for i in $(INSTALL_TOPDIR_BINS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(topdir)"; \ - done -ifneq "$(INSTALL_TOPDIR_SCRIPTS)" "" - for i in $(INSTALL_TOPDIR_SCRIPTS); do \ - $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(topdir)"; \ +install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) +ifneq "$(INSTALL_LIBEXEC_SCRIPTS)" "" + $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)/bin" + for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)/bin"; \ done endif @@ -1035,8 +1032,6 @@ $(eval $(call bindist-list,.,\ $(libffi_HEADERS) \ $(INSTALL_LIBEXECS) \ $(INSTALL_LIBEXEC_SCRIPTS) \ - $(INSTALL_TOPDIR_BINS) \ - $(INSTALL_TOPDIR_SCRIPTS) \ $(INSTALL_BINS) \ $(INSTALL_SCRIPTS) \ $(INSTALL_MANPAGES) \ |