summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorJames Denholm <nod.helm@gmail.com>2014-05-06 12:41:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-06 22:35:41 (GMT)
commit2c45009b734beed92414fd7249faa0b009432a1b (patch)
tree4d9b3e979dede3233402a926d39862a7b3dc87b3 /contrib/subtree
parent8e2a5ccad11bc21eb72499133bc884024e299983 (diff)
downloadgit-2c45009b734beed92414fd7249faa0b009432a1b.zip
git-2c45009b734beed92414fd7249faa0b009432a1b.tar.gz
git-2c45009b734beed92414fd7249faa0b009432a1b.tar.bz2
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 <peff@peff.net> Signed-off-by: James Denholm <nod.helm@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree')
-rw-r--r--contrib/subtree/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index f63334b..579bb51 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