All of lore.kernel.org
 help / color / mirror / Atom feed
From: James Denholm <nod.helm@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, James Denholm <nod.helm@gmail.com>
Subject: [PATCH v2 3/5] contrib/subtree/Makefile: s/libexecdir/gitexecdir
Date: Tue,  6 May 2014 22:41:47 +1000	[thread overview]
Message-ID: <1399380109-3805-4-git-send-email-nod.helm@gmail.com> (raw)
In-Reply-To: <1399380109-3805-1-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.

Reviewed-by: Jeff King <peff@peff.net>
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

  parent reply	other threads:[~2014-05-06 16:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-06 12:41 [PATCH v2 0/5] contrib/subtree/Makefile: Standardisation pass James Denholm
2014-05-06 12:41 ` [PATCH v2 1/5] contrib/subtree/Makefile: scrap unused $(gitdir) James Denholm
2014-05-06 12:41 ` [PATCH v2 2/5] contrib/subtree/Makefile: Use GIT-VERSION-FILE James Denholm
2014-05-06 12:41 ` James Denholm [this message]
2014-05-06 12:41 ` [PATCH v2 4/5] contrib/subtree/Makefile: Doc-gen rules cleanup James Denholm
2014-05-06 12:41 ` [PATCH v2 5/5] contrib/subtree/Makefile: clean rule cleanup James Denholm
2014-05-06 21:17 ` [PATCH v2 0/5] contrib/subtree/Makefile: Standardisation pass Junio C Hamano
2014-05-06 21:46   ` James Denholm
  -- strict thread matches above, loose matches on Subject: below --
2014-05-03 12:49 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     ` [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=1399380109-3805-4-git-send-email-nod.helm@gmail.com \
    --to=nod.helm@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.