diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-14 17:49:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-14 17:49:40 -0700 |
| commit | 4698ef555a1706fe322a68a02a21fb1087940ac3 (patch) | |
| tree | 4de02fa162b3605ff590a5219b7e61ca0c714c48 /gitk-git/Makefile | |
| parent | 1658c6149ac4462c874810c760507040122917e8 (diff) | |
| parent | 2708d9df59e45bd74bfb71027e1ea7c54a9eecd5 (diff) | |
| download | git-4698ef555a1706fe322a68a02a21fb1087940ac3.tar.gz | |
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: initial Italian translation
gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d
gitk: Avoid Tcl error when switching views
[PATCH] gitk: Don't show local changes when we there is no work tree
[PATCH] gitk: Add horizontal scrollbar to the diff view
[PATCH] gitk: make autoselect optional
[PATCH] gitk: Mark another string for translation
[PATCH] Add an --argscmd flag to get the list of refs to show
gitk: Only restore window size from ~/.gitk, not position
Diffstat (limited to 'gitk-git/Makefile')
| -rw-r--r-- | gitk-git/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gitk-git/Makefile b/gitk-git/Makefile index ae2b80b108..f90dfabffa 100644 --- a/gitk-git/Makefile +++ b/gitk-git/Makefile @@ -8,6 +8,7 @@ gitk_libdir ?= $(sharedir)/gitk/lib msgsdir ?= $(gitk_libdir)/msgs msgsdir_SQ = $(subst ','\'',$(msgsdir)) +TCL_PATH ?= tclsh TCLTK_PATH ?= wish INSTALL ?= install RM ?= rm -f @@ -22,6 +23,9 @@ ifdef NO_MSGFMT MSGFMT ?= $(TCL_PATH) po/po2msg.sh else MSGFMT ?= msgfmt + ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0) + MSGFMT := $(TCL_PATH) po/po2msg.sh + endif endif PO_TEMPLATE = po/gitk.pot |