summaryrefslogtreecommitdiff
path: root/git-gui/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-01-24 05:37:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-24 05:37:12 (GMT)
commitcab31fa076253fcfafa7572c24e40f12a1e09ae3 (patch)
tree00d6cf078f517f759499c5e44799682377ace1b9 /git-gui/Makefile
parent5a9dd3998fb4c3ddc048cbcab74a8df72bff91b7 (diff)
parent3b8f19a02c3dd6043a7a6bdd65de2d4610c26b81 (diff)
downloadgit-cab31fa076253fcfafa7572c24e40f12a1e09ae3.zip
git-cab31fa076253fcfafa7572c24e40f12a1e09ae3.tar.gz
git-cab31fa076253fcfafa7572c24e40f12a1e09ae3.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Correctly cleanup msgfmt '1 message untranslated' output git-gui: Make the statistics of po2msg match those of msgfmt git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available git-gui: Work around random missing scrollbar in revision list
Diffstat (limited to 'git-gui/Makefile')
-rw-r--r--git-gui/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile
index 1baf4b0..34438cd 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -67,7 +67,7 @@ ifndef V
QUIET_GEN = $(QUIET)echo ' ' GEN '$@' &&
QUIET_INDEX = $(QUIET)echo ' ' INDEX $(dir $@) &&
QUIET_MSGFMT0 = $(QUIET)printf ' MSGFMT %12s ' $@ && v=`
- QUIET_MSGFMT1 = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages//g'
+ QUIET_MSGFMT1 = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages*//g'
QUIET_2DEVNULL = 2>/dev/null
INSTALL_D0 = dir=
@@ -198,6 +198,9 @@ ifdef NO_MSGFMT
MSGFMT ?= $(TCL_PATH) po/po2msg.sh
else
MSGFMT ?= msgfmt
+ ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
+ MSGFMT := $(TCL_PATH) po/po2msg.sh
+ endif
endif
msgsdir = $(gg_libdir)/msgs