From: Johannes Sixt Date: Mon, 11 Jun 2007 08:02:17 +0000 (+0200) Subject: Avoid double-slash in path names that depend on $(sharedir). X-Git-Tag: v1.5.3-rc0~114 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9354768ab7a349f0df7c8aa08e6fe98547882809;p=git.git Avoid double-slash in path names that depend on $(sharedir). Recent git-gui has the ability to determine the location of its library files relative to the --exec-dir. Its Makefile enables this capability depending on the install paths that are specified. However, without this fix there is an extra slash in a path specification, so that the Makefile does not recognize the equivalence of two paths that it compares. A side-effect is that all "standard" builds (which do not set $(sharedir) explicitly) now exploit above mentioned gut-gui feature. Another side-effect is that an ugly compiled-in double-slash in $(template_dir) is avoided. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 30a405292..7ce248ea8 100644 --- a/Makefile +++ b/Makefile @@ -144,7 +144,7 @@ STRIP ?= strip prefix = $(HOME) bindir = $(prefix)/bin gitexecdir = $(bindir) -sharedir = $(prefix)/share/ +sharedir = $(prefix)/share template_dir = $(sharedir)/git-core/templates/ ifeq ($(prefix),/usr) sysconfdir = /etc