From 1537759c756f873b334b0d1a36c183a48d4eb111 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Tue, 16 May 2017 14:48:26 -0700 Subject: [PATCH 1/2] Use DESTDIR when installing/uninstalling completions --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e38f9fa..deaf810 100644 --- a/Makefile +++ b/Makefile @@ -24,20 +24,20 @@ install-man: install -m644 -- contrib/man/exa.1 "$(DESTDIR)$(PREFIX)/share/man/man1/" install-bash-completions: - install -m644 -- contrib/completions.bash "$(BASHDIR)/exa" + install -m644 -- contrib/completions.bash "$(DESTDIR)$(BASHDIR)/exa" install-zsh-completions: - install -m644 -- contrib/completions.zsh "$(ZSHDIR)/_exa" + install -m644 -- contrib/completions.zsh "$(DESTDIR)$(ZSHDIR)/_exa" install-fish-completions: - install -m644 -- contrib/completions.fish "$(FISHDIR)/exa.fish" + install -m644 -- contrib/completions.fish "$(DESTDIR)$(FISHDIR)/exa.fish" uninstall: -rm -f -- "$(DESTDIR)$(PREFIX)/share/man/man1/exa.1" -rm -f -- "$(DESTDIR)$(PREFIX)/bin/exa" - -rm -f -- "$(BASHDIR)/exa" - -rm -f -- "$(ZSHDIR)/_exa" - -rm -f -- "$(FISHDIR)/exa.fish" + -rm -f -- "$(DESTDIR)$(BASHDIR)/exa" + -rm -f -- "$(DESTDIR)$(ZSHDIR)/_exa" + -rm -f -- "$(DESTDIR)$(FISHDIR)/exa.fish" clean: cargo clean From 625ce231e7a3bcfa89269f6a9532f04fdadc3a16 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Tue, 16 May 2017 15:19:01 -0700 Subject: [PATCH 2/2] Use pkg-config for FISHDIR/BASHDIR It looks like zsh doesn't have a pkg-config file so we can't use it for ZSHDIR. Fixes #179. --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index deaf810..c0a09b0 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,15 @@ DESTDIR = PREFIX = /usr/local -BASHDIR = $(PREFIX)/etc/bash_completion.d +override define compdir +ifndef $(1) +$(1) := $$(or $$(shell pkg-config --variable=completionsdir $(2) 2>/dev/null),$(3)) +endif +endef + +$(eval $(call compdir,BASHDIR,bash-completion,$(PREFIX)/etc/bash_completion.d)) ZSHDIR = /usr/share/zsh/vendor-completions -FISHDIR = $(PREFIX)/share/fish/vendor_completions.d +$(eval $(call compdir,FISHDIR,fish,$(PREFIX)/share/fish/vendor_completions.d)) FEATURES ?= default