Skip to content

Commit 4ec1a43

Browse files
hasufellpepeiborramergify[bot]
authored
Improve bindist makefile (#2746)
* Fix 'argument list too long' errors in for loop * Fix symlink creation when DESTDIR is used Co-authored-by: Pepe Iborra <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 911fe59 commit 4ec1a43

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

bindist/GNUmakefile.in

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ BINDIR ?= $(PREFIX)/bin
55

66
HLS_VERSION := @@HLS_VERSION@@
77

8+
FIND := find
89
INSTALL := install
910
INSTALL_D := $(INSTALL) -d
1011
INSTALL_X := $(INSTALL) -vm 755
@@ -18,10 +19,7 @@ install:
1819
$(INSTALL_D) "$(DESTDIR)$(BINDIR)"
1920
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/lib"
2021
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/bin"
21-
for f in $(wildcard lib/*/*) ; do \
22-
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/`dirname $$f`" && \
23-
$(INSTALL_X) "$$f" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/$$f" ; \
24-
done
22+
$(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"' - '{}' \;
2523
for b in $(wildcard bin/*) ; do \
2624
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/" && \
2725
$(INSTALL_X) "$$b" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/$$b" ; \
@@ -31,7 +29,7 @@ install:
3129
"$$h" > "$(DESTDIR)$(BINDIR)/$${h%.in}" && \
3230
$(CHMOD_X) "$(DESTDIR)$(BINDIR)/$${h%.in}" ; \
3331
done
34-
$(LN_S) "`scripts/relpath.sh "$(BINDIR)" "$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/bin/haskell-language-server-wrapper"`" \
32+
$(LN_S) "`scripts/relpath.sh "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/bin/haskell-language-server-wrapper"`" \
3533
"$(DESTDIR)$(BINDIR)/haskell-language-server-wrapper"
3634

3735
version:

0 commit comments

Comments
 (0)