summaryrefslogtreecommitdiff
path: root/git-gui/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-18 00:16:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-18 00:16:56 (GMT)
commitc182ec90d824168cfb70494bb920c0a2fb590d98 (patch)
treeb707c9feab812236a6cd95798ba2f8323adec055 /git-gui/Makefile
parent35812d830579643f898979be479b6fee5f7c7b38 (diff)
parent845d377b2880a0c5d74f785244469ab1ac815bde (diff)
downloadgit-c182ec90d824168cfb70494bb920c0a2fb590d98.zip
git-c182ec90d824168cfb70494bb920c0a2fb590d98.tar.gz
git-c182ec90d824168cfb70494bb920c0a2fb590d98.tar.bz2
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: git-gui: Honor TCLTK_PATH if supplied Revert "Allow wish interpreter to be defined with TCLTK_PATH" git-gui: Display the directory basename in the title git-gui: Brown paper bag fix division by 0 in blame Always bind the return key to the default button Do not break git-gui messages into multiple lines. Improve look-and-feel of the git-gui tool. Teach git-gui to use the user-defined UI font everywhere. Allow wish interpreter to be defined with TCLTK_PATH
Diffstat (limited to 'git-gui/Makefile')
-rw-r--r--git-gui/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile
index b82789e..b29d7d1 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -28,6 +28,8 @@ ifndef V
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
endif
+TCLTK_PATH ?= wish
+
ifeq ($(findstring $(MAKEFLAGS),s),s)
QUIET_GEN =
QUIET_BUILT_IN =
@@ -36,10 +38,12 @@ endif
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
$(QUIET_GEN)rm -f $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ -e 's|^exec wish "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \
-e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
$@.sh >$@+ && \
chmod +x $@+ && \