From a906459c2a89938e911f1650e6ce22315a1ec84d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 4 Jan 2013 11:54:21 -0500 Subject: [PATCH] git-subtree: Use gitexecdir instead of libexecdir When the git subtree Makefile includes config.mak from the toplevel, it's useful to have the same variables set globally applied. Using gitexecdir instead of libexecdir respects the global settings more consistently. Remove the unused gitdir variable as well. --- contrib/subtree/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 435b2de..dc8da19 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -2,9 +2,8 @@ -include ../../config.mak prefix ?= /usr/local +gitexecdir ?= $(prefix)/libexec/git-core mandir ?= $(prefix)/share/man -libexecdir ?= $(prefix)/libexec/git-core -gitdir ?= $(shell git --exec-path) man1dir ?= $(mandir)/man1 gitver ?= $(word 3,$(shell git --version)) @@ -30,8 +29,8 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML) install: $(GIT_SUBTREE) - $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir) - $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir) + $(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir) + $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir) install-doc: install-man -- 1.8.3.1