summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-06-11 08:02:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-12 07:23:31 (GMT)
commit9354768ab7a349f0df7c8aa08e6fe98547882809 (patch)
treeccaa00d9a9662408c52b83b2a27f92c879a4ca85 /Makefile
parent30ba3809a4670c99c73800393ce29473c84c8521 (diff)
downloadgit-9354768ab7a349f0df7c8aa08e6fe98547882809.zip
git-9354768ab7a349f0df7c8aa08e6fe98547882809.tar.gz
git-9354768ab7a349f0df7c8aa08e6fe98547882809.tar.bz2
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 30a4052..7ce248e 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