From: James Denholm Date: Tue, 6 May 2014 12:41:47 +0000 (+1000) Subject: contrib/subtree/Makefile: s/libexecdir/gitexecdir/ X-Git-Tag: v2.1.0-rc0~156^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2c45009b734beed92414fd7249faa0b009432a1b contrib/subtree/Makefile: s/libexecdir/gitexecdir/ $(libexecdir) isn't used anywhere else in the project, while $(gitexecdir) is the standard in the other appropriate makefiles. Hence, replace the former with the latter. Reviewed-by: Jeff King Signed-off-by: James Denholm Signed-off-by: Junio C Hamano --- diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index f63334bd65..579bb51bf0 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -3,7 +3,7 @@ prefix ?= /usr/local mandir ?= $(prefix)/share/man -libexecdir ?= $(prefix)/libexec/git-core +gitexecdir ?= $(prefix)/libexec/git-core man1dir ?= $(mandir)/man1 ../../GIT-VERSION-FILE: FORCE @@ -33,8 +33,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