git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Fix Git install directory.
@ 2009-02-05  7:37 Pascal Obry
  0 siblings, 0 replies; only message in thread
From: Pascal Obry @ 2009-02-05  7:37 UTC (permalink / raw)
  To: Git Mailing List

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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2009-02-05  7:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-05  7:37 [PATCH] Fix Git install directory Pascal Obry

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).