[PATCH/RFC v3 4/7] Makefile: Don't install Gettext .mo files if NO_GETTEXT
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2016-06-15 22:48:53
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
Change the Makefile not to build/install .mo files as part of the default target if NO_GETTEXT=1 is given. This was both redundant, and meant that the Perl and Shell programs would use the Gettext strings, since they don't use the git_setup_gettext() function in gettext.c, which is compiled to a stub if NO_GETTEXT=1 is set. Reported-by: Jakub Narebski <redacted> Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 3f0e305..40eb1a2 100644
--- a/Makefile
+++ b/Makefile@@ -1891,7 +1891,9 @@ pot: POFILES := $(wildcard po/*.po) MOFILES := $(patsubst po/%.po,share/locale/%/LC_MESSAGES/git.mo,$(POFILES)) MODIRS := $(patsubst po/%.po,share/locale/%/LC_MESSAGES/,$(POFILES)) +ifndef NO_GETTEXT all:: $(MOFILES) +endif share/locale/%/LC_MESSAGES/git.mo: po/%.po @mkdir -p $(dir $@) $(QUIET_MSGFMT)$(MSGFMT) -o $@ $<
@@ -2008,9 +2010,11 @@ install: all $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)' +ifndef NO_GETTEXT $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sharedir_SQ)/locale' (cd share && tar cf - locale) | \ (cd '$(DESTDIR_SQ)$(sharedir_SQ)' && umask 022 && tar xof -) +endif $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install ifndef NO_PERL $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
--
1.7.1.248.gb7713.dirty