Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Improve bindist makefile #2746

Merged
merged 4 commits into from
Mar 4, 2022
Merged

Improve bindist makefile #2746

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dde6712
Fix 'argument list too long' errors in for loop
hasufell Mar 3, 2022
f94f516
Fix symlink creation when DESTDIR is used
hasufell Mar 3, 2022
e3f28d7
Merge branch 'master' into improve-bindist-makefile
pepeiborra Mar 3, 2022
d085682
Merge branch 'master' into improve-bindist-makefile
mergify[bot] Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions bindist/GNUmakefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ BINDIR ?= $(PREFIX)/bin

HLS_VERSION := @@HLS_VERSION@@

FIND := find
INSTALL := install
INSTALL_D := $(INSTALL) -d
INSTALL_X := $(INSTALL) -vm 755
Expand All @@ -18,10 +19,7 @@ install:
$(INSTALL_D) "$(DESTDIR)$(BINDIR)"
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/lib"
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/bin"
for f in $(wildcard lib/*/*) ; do \
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/`dirname $$f`" && \
$(INSTALL_X) "$$f" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/$$f" ; \
done
$(FIND) lib -mindepth 2 -type f -exec sh -c '$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/`dirname $$1`" && $(INSTALL_X) "$$1" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/$$1"' - '{}' \;
for b in $(wildcard bin/*) ; do \
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/" && \
$(INSTALL_X) "$$b" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/$$b" ; \
Expand All @@ -31,7 +29,7 @@ install:
"$$h" > "$(DESTDIR)$(BINDIR)/$${h%.in}" && \
$(CHMOD_X) "$(DESTDIR)$(BINDIR)/$${h%.in}" ; \
done
$(LN_S) "`scripts/relpath.sh "$(BINDIR)" "$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/bin/haskell-language-server-wrapper"`" \
$(LN_S) "`scripts/relpath.sh "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/bin/haskell-language-server-wrapper"`" \
"$(DESTDIR)$(BINDIR)/haskell-language-server-wrapper"

version:
Expand Down