Merge ../gitk
* ../gitk:
gitk: Update German translation.
gitk: Fix typo in user message.
gitk: Fix the Makefile to cope with systems lacking msgfmt
diff --git a/gitk-git/Makefile b/gitk-git/Makefile
index 6158504..ae2b80b 100644
--- a/gitk-git/Makefile
+++ b/gitk-git/Makefile
@@ -18,7 +18,12 @@
## po-file creation rules
XGETTEXT ?= xgettext
-MSGFMT ?= msgfmt
+ifdef NO_MSGFMT
+ MSGFMT ?= $(TCL_PATH) po/po2msg.sh
+else
+ MSGFMT ?= msgfmt
+endif
+
PO_TEMPLATE = po/gitk.pot
ALL_POFILES = $(wildcard po/*.po)
ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))