From: Charles Bailey <charles@hashpling.org>
To: git@vger.kernel.org
Subject: [PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui
Date: Wed, 9 Jan 2008 13:29:53 +0000 [thread overview]
Message-ID: <20080109132953.GA12489@hashpling.org> (raw)
Make the behaviour of a top level make NO_MSGFMT=Yes consistent when
performing the subdirectory builds in gitk-git and git-gui.
Signed-off-by: Charles Bailey <charles@hashpling.org>
---
gitk-git/Makefile | 7 ++++++-
{git-gui => gitk-git}/po/.gitignore | 0
{git-gui => gitk-git}/po/po2msg.sh | 0
3 files changed, 6 insertions(+), 1 deletions(-)
copy {git-gui => gitk-git}/po/.gitignore (100%)
copy {git-gui => gitk-git}/po/po2msg.sh (100%)
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 @@ TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
## 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))
diff --git a/git-gui/po/.gitignore b/gitk-git/po/.gitignore
similarity index 100%
copy from git-gui/po/.gitignore
copy to gitk-git/po/.gitignore
diff --git a/git-gui/po/po2msg.sh b/gitk-git/po/po2msg.sh
similarity index 100%
copy from git-gui/po/po2msg.sh
copy to gitk-git/po/po2msg.sh
--
1.5.4.rc2.60.gb2e62
next reply other threads:[~2008-01-09 13:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-09 13:29 Charles Bailey [this message]
2008-01-09 13:40 ` [PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui Johannes Schindelin
2008-01-09 13:52 ` Charles Bailey
2008-01-09 14:06 ` Johannes Schindelin
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=20080109132953.GA12489@hashpling.org \
--to=charles@hashpling.org \
--cc=git@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.