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 <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt committed
Jun 11, 2007 at 10:02 UTC
9354768ab7a349f0df7c8aa08e6fe98547882809
1 file changed
+1
-1
Makefile
+1
-1
@@ -144,7 +144,7 @@ STRIP ?= strip
144
prefix = $(HOME)
145
bindir = $(prefix)/bin
146
gitexecdir = $(bindir)
147
-sharedir = $(prefix)/share/
147
+sharedir = $(prefix)/share
148
template_dir = $(sharedir)/git-core/templates/
149
ifeq ($(prefix),/usr)
150
sysconfdir = /etc