git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: James Denholm <nod.helm@gmail.com>
To: git@vger.kernel.org
Cc: greend@obbligato.org, apenwarr@gmail.com, gpmcgee@gmail.com,
	peff@peff.net, mmogilvi_git@miniinfo.net,
	James Denholm <nod.helm@gmail.com>
Subject: [PATCH v2 3/5] contrib/subtree/Makefile: s/libexecdir/gitexecdir
Date: Sat,  3 May 2014 22:49:33 +1000	[thread overview]
Message-ID: <1399121375-14727-4-git-send-email-nod.helm@gmail.com> (raw)
In-Reply-To: <1399121375-14727-3-git-send-email-nod.helm@gmail.com>

$(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.

Signed-off-by: James Denholm <nod.helm@gmail.com>
---
 contrib/subtree/Makefile | 6 +++---
 1 file 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
 
-- 
1.9.2

  reply	other threads:[~2014-05-03 12:50 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-03 12:49 [PATCH v2 0/5] contrib/subtree/Makefile: Standardisation pass James Denholm
2014-05-03 12:49 ` [PATCH v2 1/5] contrib/subtree/Makefile: scrap unused $(gitdir) James Denholm
2014-05-03 12:49   ` [PATCH v2 2/5] contrib/subtree/Makefile: Use GIT-VERSION-FILE James Denholm
2014-05-03 12:49     ` James Denholm [this message]
2014-05-03 12:49       ` [PATCH v2 4/5] contrib/subtree/Makefile: Doc-gen rules cleanup James Denholm
2014-05-03 12:49         ` [PATCH v2 5/5] contrib/subtree/Makefile: clean rule cleanup James Denholm
2014-05-05  5:09           ` Jeff King
2014-05-05 21:41             ` James Denholm
2014-05-05 21:49               ` Jeff King
2014-05-05 21:59                 ` James Denholm
2014-05-05  5:08 ` [PATCH v2 0/5] contrib/subtree/Makefile: Standardisation pass Jeff King
2014-05-05 21:54   ` James Denholm
2014-05-05 22:01     ` Jeff King
2014-05-06 12:41       ` James Denholm
  -- strict thread matches above, loose matches on Subject: below --
2014-05-06 12:41 James Denholm
2014-05-06 12:41 ` [PATCH v2 3/5] contrib/subtree/Makefile: s/libexecdir/gitexecdir James Denholm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1399121375-14727-4-git-send-email-nod.helm@gmail.com \
    --to=nod.helm@gmail.com \
    --cc=apenwarr@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gpmcgee@gmail.com \
    --cc=greend@obbligato.org \
    --cc=mmogilvi_git@miniinfo.net \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).