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@xxxxxxxxxxxxx>
---
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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
