From 36e6de10c80c0986dc715dcef3c5212035c484d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=B3=BD=E8=BD=A9?= Date: Fri, 27 Jan 2023 19:38:56 +0800 Subject: [PATCH] revert the completion dir change on MacOS (#1026) Fix https://github.com/tj/git-extras/issues/1018 --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 72a8187..c243f48 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,11 @@ ifeq ($(OS), FreeBSD) else MANPREFIX ?= "$(PREFIX)/share/man/man1" endif +ifeq ($(OS), Darwin) + COMPL_DIR ?= "$(DESTDIR)$(SYSCONFDIR)/bash_completion.d" +else + COMPL_DIR ?= "$(DESTDIR)$(SYSCONFDIR)/bash-completion/completions" +endif SYSCONFDIR ?= $(PREFIX)/etc BINS = $(wildcard bin/git-*) @@ -70,8 +75,8 @@ install: check cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \ echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \ fi - @mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash-completion/completions - cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash-completion/completions/git-extras + @mkdir -p $(COMPL_DIR) + cp -f etc/bash_completion.sh $(COMPL_DIR)/git-extras @echo "" @echo "If you are a zsh user, you may want to 'source $(CODE_DIR)etc/git-extras-completion.zsh'" \ "and put this line into ~/.zshrc to enable zsh completion" @@ -120,7 +125,7 @@ uninstall: echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \ rm -f $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN)); \ ) - rm -f $(DESTDIR)$(SYSCONFDIR)/bash-completion/completions/git-extras + rm -f $(COMPL_DIR)/git-extras clean: docclean