Skip to content

Commit 9354768

Browse files
Johannes Sixtgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 30ba380 commit 9354768

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ STRIP ?= strip
144144
prefix = $(HOME)
145145
bindir = $(prefix)/bin
146146
gitexecdir = $(bindir)
147-
sharedir = $(prefix)/share/
147+
sharedir = $(prefix)/share
148148
template_dir = $(sharedir)/git-core/templates/
149149
ifeq ($(prefix),/usr)
150150
sysconfdir = /etc

0 commit comments

Comments
 (0)