git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pascal Obry <pascal@obry.net>
To: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] Fix Git install directory.
Date: Thu, 5 Feb 2009 08:37:24 +0100	[thread overview]
Message-ID: <a2633edd0902042337jaa9d1cfqee3c61f486adadd1@mail.gmail.com> (raw)

Remove trailing slash in gitexecdir and template_dir.
With a trailing slash Git gets installed into a wrong location. If
prefix is /usr/local it gets installed into /usr/local/usr/local.
This is because the comparison in Makefile:

   ifeq ($(abspath $(gitexecdir)),$(gitexecdir))
      gitexec_instdir = $(gitexecdir)

is always wrong as abspath does remove the trailing slash. In this case
the else part is used and prefix is added in front of the already absolute
pathname:

   else
      gitexec_instdir = $(prefix)/$(gitexecdir)

Signed-off-by: Pascal Obry <pascal@obry.net>
---
 config.mak.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.mak.in b/config.mak.in
index 55b25c3..7cce0c1 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -13,9 +13,9 @@ TCLTK_PATH = @TCLTK_PATH@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
-gitexecdir = @libexecdir@/git-core/
+gitexecdir = @libexecdir@/git-core
 datarootdir = @datarootdir@
-template_dir = @datadir@/git-core/templates/
+template_dir = @datadir@/git-core/templates

 mandir=@mandir@

-- 
1.6.1.2.351.g80f18.dirty


-- 

--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|              http://www.obry.net
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595

                 reply	other threads:[~2009-02-05  7:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=a2633edd0902042337jaa9d1cfqee3c61f486adadd1@mail.gmail.com \
    --to=pascal@obry.net \
    --cc=git@vger.kernel.org \
    /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).