Re: [PATCH] makefile: teach git about NO_MSGFMT (as supported in GUI and gitk)
From: Johannes Schindelin <hidden>
Date: 2021-09-02 15:32:39
Hi Carlo, On Thu, 2 Sep 2021, Carlo Marcelo Arenas Belón wrote:
NO_MSGFMT can be used to indicate there is no msgfmt available, so make git recognize that and avoid failing to build while trying to generate i18n files. while at it, refactor the change introduced in 4348824059 (artifacts-tar: respect NO_GETTEXT, 2021-07-04) with something as functional but shorter.
To me, this commit message is not really related to the diff, which essentially only adds a code comment and then has the only functional change that _prevents_ `POFILES` and `MOFILES` from being set to empty values when `NO_MSGFMT` is set. I am therefore quite puzzled how that diff is supposed to achieve anything that is described in the commit message (how does this "make git recognize that"?). Could you maybe clarify that? Thanks, Dscho
quoted hunk ↗ jump to hunk
Signed-off-by: Carlo Marcelo Arenas Belón <redacted> --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)diff --git a/Makefile b/Makefile index 9573190f1d..9f09a75801 100644 --- a/Makefile +++ b/Makefile@@ -86,6 +86,8 @@ all:: # Define LIBC_CONTAINS_LIBINTL if your gettext implementation doesn't # need -lintl when linking. # +# Define NO_MSGFMT if you don't have msgfmt +# # Define NO_MSGFMT_EXTENDED_OPTIONS if your implementation of msgfmt # doesn't support GNU extensions like --check and --statistics #@@ -2691,10 +2693,8 @@ po/git.pot: $(GENERATED_H) FORCE .PHONY: pot pot: po/git.pot -ifdef NO_GETTEXT -POFILES := -MOFILES := -else +ifndef NO_MSGFMT +ifndef NO_GETTEXT POFILES := $(wildcard po/*.po) MOFILES := $(patsubst po/%.po,po/build/locale/%/LC_MESSAGES/git.mo,$(POFILES))@@ -2703,6 +2703,7 @@ endif po/build/locale/%/LC_MESSAGES/git.mo: po/%.po $(QUIET_MSGFMT)mkdir -p $(dir $@) && $(MSGFMT) -o $@ $< +endif LIB_PERL := $(wildcard perl/Git.pm perl/Git/*.pm perl/Git/*/*.pm perl/Git/*/*/*.pm) LIB_PERL_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_PERL)) --2.33.0.481.g26d3bed244