From f4cb9ef57d4877fa585fd0d8a3a4d036ec5d8848 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 7 Jun 2016 18:55:18 -0400 Subject: [PATCH] nls-global.mk: search build dir for source files, too In VPATH builds, the build directory was not being searched for files in GETTEXT_FILES, leading to failure to construct the .pot files. This has bit me all along, but never hard enough to get it fixed; I suppose not a lot of people uses VPATH and NLS-enabled builds, and those that do, don't do "make update-po" often. This is a longstanding problem, so backpatch all the way back. --- src/nls-global.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls-global.mk b/src/nls-global.mk index 32b3c0fbd61..f62c2ff3663 100644 --- a/src/nls-global.mk +++ b/src/nls-global.mk @@ -48,7 +48,7 @@ all-po: $(MO_FILES) ifeq ($(word 1,$(GETTEXT_FILES)),+) po/$(CATALOG_NAME).pot: $(word 2, $(GETTEXT_FILES)) $(MAKEFILE_LIST) ifdef XGETTEXT - $(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) -f $< + $(XGETTEXT) -D $(srcdir) -D . -n $(addprefix -k, $(GETTEXT_TRIGGERS)) -f $< else @echo "You don't have 'xgettext'."; exit 1 endif @@ -57,7 +57,7 @@ po/$(CATALOG_NAME).pot: $(GETTEXT_FILES) $(MAKEFILE_LIST) # Change to srcdir explicitly, don't rely on $^. That way we get # consistent #: file references in the po files. ifdef XGETTEXT - $(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(GETTEXT_FILES) + $(XGETTEXT) -D $(srcdir) -D . -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(GETTEXT_FILES) else @echo "You don't have 'xgettext'."; exit 1 endif -- 2.39.5