Merge branch 'maint'

diff --git a/Makefile b/Makefile
index df6f6b727569a0a3d5cf8e19fc3ddfacab0b8639..5b1ff914944a52dcc4519425562e34d6ceea3662 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -78,8 +78,8 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH))
 TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 
-libdir   ?= $(sharedir)/git-gui/lib
-libdir_SQ = $(subst ','\'',$(libdir))
+gg_libdir ?= $(sharedir)/git-gui/lib
+libdir_SQ  = $(subst ','\'',$(gg_libdir))
 
 exedir    = $(dir $(gitexecdir))share/git-gui/lib
 exedir_SQ = $(subst ','\'',$(exedir))
@@ -107,7 +107,7 @@ $(GITGUI_BUILT_INS): git-gui
 
 XGETTEXT   ?= xgettext
 MSGFMT     ?= msgfmt
-msgsdir    ?= $(libdir)/msgs
+msgsdir     = $(gg_libdir)/msgs
 msgsdir_SQ  = $(subst ','\'',$(msgsdir))
 PO_TEMPLATE = po/git-gui.pot
 ALL_POFILES = $(wildcard po/*.po)
@@ -143,7 +143,7 @@ TRACK_VARS = \
        $(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \
        $(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \
        $(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \
-       $(subst ','\'',libdir='$(libdir_SQ)') \
+       $(subst ','\'',gg_libdir='$(libdir_SQ)') \
 #end TRACK_VARS
 
 GIT-GUI-VARS: .FORCE-GIT-GUI-VARS