diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-01-23 21:37:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-23 21:37:12 -0800 |
| commit | cab31fa076253fcfafa7572c24e40f12a1e09ae3 (patch) | |
| tree | 00d6cf078f517f759499c5e44799682377ace1b9 /git-gui/Makefile | |
| parent | 5a9dd3998fb4c3ddc048cbcab74a8df72bff91b7 (diff) | |
| parent | 3b8f19a02c3dd6043a7a6bdd65de2d4610c26b81 (diff) | |
| download | git-cab31fa076253fcfafa7572c24e40f12a1e09ae3.tar.gz git-cab31fa076253fcfafa7572c24e40f12a1e09ae3.tar.xz | |
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/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index 1baf4b086..34438cdf5 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 |