Commit c1bd3d44 authored by thomie's avatar thomie

Build system: also put scripts in libexecdir/bin

This follows a similar change in
4905b83a, 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.
parent 1722fa10
...@@ -851,7 +851,7 @@ TAGS: TAGS_compiler ...@@ -851,7 +851,7 @@ TAGS: TAGS_compiler
# Installation # Installation
install: install_libs install_packages install_libexecs \ install: install_libs install_packages install_libexecs \
install_bins install_topdirs install_bins install_libexec_scripts
ifeq "$(HADDOCK_DOCS)" "YES" ifeq "$(HADDOCK_DOCS)" "YES"
install: install_docs install: install_docs
endif endif
...@@ -910,14 +910,11 @@ ifeq "$(Windows_Host)" "NO" ...@@ -910,14 +910,11 @@ ifeq "$(Windows_Host)" "NO"
endif endif
endif endif
install_topdirs: $(INSTALL_TOPDIR_BINS) $(INSTALL_TOPDIR_SCRIPTS) install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS)
$(INSTALL_DIR) "$(DESTDIR)$(topdir)" ifneq "$(INSTALL_LIBEXEC_SCRIPTS)" ""
for i in $(INSTALL_TOPDIR_BINS); do \ $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)/bin"
$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(topdir)"; \ for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
done $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)/bin"; \
ifneq "$(INSTALL_TOPDIR_SCRIPTS)" ""
for i in $(INSTALL_TOPDIR_SCRIPTS); do \
$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(topdir)"; \
done done
endif endif
...@@ -1035,8 +1032,6 @@ $(eval $(call bindist-list,.,\ ...@@ -1035,8 +1032,6 @@ $(eval $(call bindist-list,.,\
$(libffi_HEADERS) \ $(libffi_HEADERS) \
$(INSTALL_LIBEXECS) \ $(INSTALL_LIBEXECS) \
$(INSTALL_LIBEXEC_SCRIPTS) \ $(INSTALL_LIBEXEC_SCRIPTS) \
$(INSTALL_TOPDIR_BINS) \
$(INSTALL_TOPDIR_SCRIPTS) \
$(INSTALL_BINS) \ $(INSTALL_BINS) \
$(INSTALL_SCRIPTS) \ $(INSTALL_SCRIPTS) \
$(INSTALL_MANPAGES) \ $(INSTALL_MANPAGES) \
......
...@@ -100,11 +100,6 @@ else ...@@ -100,11 +100,6 @@ else
# Unix: override libdir and datadir to put ghc-specific stuff in # Unix: override libdir and datadir to put ghc-specific stuff in
# a subdirectory with the version number included. # a subdirectory with the version number included.
#
# datadir is set to libdir here as GHC needs package.conf and unlit
# to be in the same place (and things like ghc-pkg need to agree on
# where package.conf is, so we just set it globally).
#
ghclibdir = $(libdir)/$(CrossCompilePrefix)ghc-$(ProjectVersion) ghclibdir = $(libdir)/$(CrossCompilePrefix)ghc-$(ProjectVersion)
ghcdocdir = $(datarootdir)/doc/ghc ghcdocdir = $(datarootdir)/doc/ghc
endif endif
......
...@@ -36,7 +36,7 @@ ifneq "$$($$($1_$2_PROG)_INPLACE)" "" ...@@ -36,7 +36,7 @@ ifneq "$$($$($1_$2_PROG)_INPLACE)" ""
$$(error $$($1_$2_PROG)_INPLACE defined twice) $$(error $$($1_$2_PROG)_INPLACE defined twice)
endif endif
ifeq "$$($1_$2_TOPDIR)" "YES" 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 else
$$($1_$2_PROG)_INPLACE = $$(INPLACE_BIN)/$$($1_$2_PROG) $$($1_$2_PROG)_INPLACE = $$(INPLACE_BIN)/$$($1_$2_PROG)
endif endif
...@@ -66,11 +66,11 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) | $$$$(dir $$$$@)/. ...@@ -66,11 +66,11 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) | $$$$(dir $$$$@)/.
endif endif
ifeq "$$($1_$2_INSTALL)" "YES" 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 # stripped when calling 'make install-strip', and stripping a Perl script
# doesn't work. # doesn't work.
ifeq "$$($1_$2_TOPDIR)" "YES" ifeq "$$($1_$2_TOPDIR)" "YES"
INSTALL_TOPDIR_SCRIPTS += $$($1_$2_INPLACE) INSTALL_LIBEXEC_SCRIPTS += $$($1_$2_INPLACE)
else else
INSTALL_SCRIPTS += $$($1_$2_INPLACE) INSTALL_SCRIPTS += $$($1_$2_INPLACE)
endif endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment