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