diff options
| author | Alvaro Herrera | 2016-06-07 22:55:18 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2016-06-07 22:55:18 +0000 |
| commit | 3dcdf9800be99a9b2409115c8aa542b234aa324f (patch) | |
| tree | 1cce5ff39b15edb48654229b5d4bc4e916755dae | |
| parent | 3201709de3a552113573f73d308b40bba8f73186 (diff) | |
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.
| -rw-r--r-- | src/nls-global.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nls-global.mk b/src/nls-global.mk index e6c4a633a43..e013d776c6d 100644 --- a/src/nls-global.mk +++ b/src/nls-global.mk @@ -73,7 +73,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)) $(addprefix --flag=, $(GETTEXT_FLAGS)) -f $< + $(XGETTEXT) -D $(srcdir) -D . -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) -f $< else @echo "You don't have 'xgettext'."; exit 1 endif @@ -82,7 +82,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)) $(addprefix --flag=, $(GETTEXT_FLAGS)) $(GETTEXT_FILES) + $(XGETTEXT) -D $(srcdir) -D . -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) $(GETTEXT_FILES) else @echo "You don't have 'xgettext'."; exit 1 endif |