summaryrefslogtreecommitdiff
path: root/git-gui/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-19 01:35:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-19 01:35:48 (GMT)
commit1eb0545cce4a4ed652425798b87cb0e777c03b3f (patch)
treefc20c82e2f05a9d6f510481b8eeb3481054975bc /git-gui/Makefile
parent3d6bc9a763f56156b424e7382b4029a67a49847e (diff)
parent4498b3a50a0e839788682f672df267cbc1ba9292 (diff)
downloadgit-1eb0545cce4a4ed652425798b87cb0e777c03b3f.zip
git-1eb0545cce4a4ed652425798b87cb0e777c03b3f.tar.gz
git-1eb0545cce4a4ed652425798b87cb0e777c03b3f.tar.bz2
Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui
git-gui 0.20.0 * tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui: git-gui: set version 0.20 git-gui: sv.po: Update Swedish translation (547t0f0u) git-gui i18n: Updated Bulgarian translation (547t,0f,0u) git-gui: Makes chooser set 'gitdir' to the resolved path git-gui: Fixes chooser not accepting gitfiles git-gui: reinstate support for Tcl 8.4 git-gui: fix problem with gui.maxfilesdisplayed git-gui: fix verbose loading when git path contains spaces. git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows git-gui: add configurable tab size to the diff view git-gui: Make git-gui lib dir configurable at runime git-gui i18n: Updated Bulgarian translation (520t,0f,0u) L10n: vi.po (543t): Init translation for Vietnamese git-gui: align the new recursive checkbox with the radiobuttons. git-gui: Add a 'recursive' checkbox in the clone menu.
Diffstat (limited to 'git-gui/Makefile')
-rw-r--r--git-gui/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile
index cde8b2e..4f00bdd 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -177,7 +177,8 @@ git-gui: GIT-VERSION-FILE GIT-GUI-VARS
echo then >>$@+ && \
echo ' 'echo \'git-gui version '$(GITGUI_VERSION)'\' >>$@+ && \
echo else >>$@+ && \
- echo ' 'exec \''$(libdir_SQ)/Git Gui.app/Contents/MacOS/$(subst \,,$(TKEXECUTABLE))'\' \
+ echo ' libdir="$${GIT_GUI_LIB_DIR:-$(libdir_SQ)}"' >>$@+ && \
+ echo ' 'exec \"'$$libdir/Git Gui.app/Contents/MacOS/$(subst \,,$(TKEXECUTABLE))'\" \
'"$$0" "$$@"' >>$@+ && \
echo fi >>$@+ && \
chmod +x $@+ && \