threads / patch / 17581

patchFix Git install directory.

Subject: [PATCH] Fix Git install directory.

## tl;dr

One message between Feb 5, 2009 and Feb 5, 2009. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Pascal Obry· Feb 5, 2009, 07:37 UTC · lore

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(-)
Show changes to config.mak.in +2 −2
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

← back to recent threads