summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-03-14 09:24:31 (GMT)
committerPaul Mackerras <paulus@samba.org>2008-03-14 09:24:31 (GMT)
commit8719f1286eb7ccaeaca301619d0d75e14df769ca (patch)
tree9fb50922bd9f8b9c11930e3d88c99dfe41bdd654
parent494d3b8a6c93d88daf4a52dbcc6ab07903f8ed4e (diff)
downloadgit-8719f1286eb7ccaeaca301619d0d75e14df769ca.zip
git-8719f1286eb7ccaeaca301619d0d75e14df769ca.tar.gz
git-8719f1286eb7ccaeaca301619d0d75e14df769ca.tar.bz2
gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d
This is a similar change to that submitted by Junio C Hamano for git-gui. It tests whether the msgfmt command can be run successfully with --tcl, -l and -d, and if not, falls back to using po/po2msg.sh. Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ae2b80b..f90dfab 100644
--- a/Makefile
+++ b/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