diff options
author | Johannes Sixt <johannes.sixt@telecom.at> | 2007-06-11 10:02:17 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-06-12 00:23:31 -0700 |
commit | 9354768ab7a349f0df7c8aa08e6fe98547882809 (patch) | |
tree | ccaa00d9a9662408c52b83b2a27f92c879a4ca85 /Makefile | |
parent | 30ba3809a4670c99c73800393ce29473c84c8521 (diff) | |
download | git-9354768ab7a349f0df7c8aa08e6fe98547882809.tar.gz git-9354768ab7a349f0df7c8aa08e6fe98547882809.tar.xz |
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-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |