git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Paul Mackerras <paulus@samba.org>, git@vger.kernel.org
Subject: [PATCH] Simplify MSGFMT setting in Makefile
Date: Tue, 11 Mar 2008 22:29:52 -0700	[thread overview]
Message-ID: <7vr6eg7bn3.fsf_-_@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7v63w0gs87.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Thu, 06 Mar 2008 00:40:56 -0800")

To prepare msg files for Tcl scripts, the command that is set to MSGFMT
make variable needs to be able to grok "--tcl -l <lang> -d <here>" options
correctly.  This patch simplifies the tests done in git-gui's Makefile to
directly test this condition.  If the test run does not exit properly with
zero status (either because you do not have "msgfmt" itself, or your
"msgfmt" is too old to grok --tcl option --- the reason does not matter),
have it fall back to po/po2msg.sh

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 * I am planning to close 'master' for -rc1 by the end of this week, so
   please plan to tell me to pull if you have accumulated changes,
   thanks.

 Makefile |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 4e32174..95e99f2 100644
--- a/Makefile
+++ b/Makefile
@@ -221,14 +221,9 @@ ifdef NO_MSGFMT
 	MSGFMT ?= $(TCL_PATH) po/po2msg.sh
 else
 	MSGFMT ?= msgfmt
-	ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
+	ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $?),0)
 		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

  reply	other threads:[~2008-03-12  5:31 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-21 23:53 msgmft segfaulting on tiger Martin Langhoff
2008-02-21 23:59 ` Martin Langhoff
2008-02-22  6:58   ` Shawn O. Pearce
2008-02-22 17:57     ` Martin Langhoff
2008-02-27 18:18       ` Gabriel Saldaña
2008-02-27 18:26         ` Johannes Schindelin
2008-02-27 18:42           ` Gabriel Saldaña
2008-02-27 22:04             ` Johannes Schindelin
2008-02-27 22:14               ` Junio C Hamano
2008-02-28  0:32                 ` Shawn O. Pearce
2008-03-04  7:02                   ` msgmft segfaulting on ubuntu gutsy (clean) Gabriel Saldaña
2008-03-04  7:07                     ` Shawn O. Pearce
2008-02-28 18:40                 ` msgmft segfaulting on tiger Gabriel Saldaña
2008-03-05  7:19                   ` Shawn O. Pearce
2008-03-06  8:40                     ` Junio C Hamano
2008-03-12  5:29                       ` Junio C Hamano [this message]
2008-03-12  5:51                         ` [PATCH] Simplify MSGFMT setting in Makefile Shawn O. Pearce
2008-03-12 10:19                         ` Charles Bailey
2008-03-14  4:44                         ` Paul Mackerras
2008-03-14  4:50                           ` Junio C Hamano
2008-03-14 13:07                           ` Andreas Ericsson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vr6eg7bn3.fsf_-_@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=paulus@samba.org \
    --cc=spearce@spearce.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).