Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Wed, 5 Mar 2008 07:13:37 +0000 (02:13 -0500)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 5 Mar 2008 07:13:37 +0000 (02:13 -0500)
* maint:
git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails

Makefile patch | blob | history
diff --git a/Makefile b/Makefile
index 01e0a46ba56faa8a17ed8710346b18dd215899c7..4e321742ab8f103d829f33ab4d6ab5430fa132ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -224,6 +224,11 @@ else
        ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
                MSGFMT := $(TCL_PATH) po/po2msg.sh
        endif
+       ifeq (msgfmt,$(MSGFMT))
+       ifeq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null || echo $?),1)
+               MSGFMT := $(TCL_PATH) po/po2msg.sh
+       endif
+       endif
 endif
 
 msgsdir     = $(gg_libdir)/msgs