diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2016-06-07 18:55:18 -0400 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2016-06-07 18:55:18 -0400 |
| commit | 736c95ca1647ae088c4c996218e8ef20a56b1795 (patch) | |
| tree | 6b396483c127cc3da28d4ecb7ec615d8bf626796 /src | |
| parent | a6dacf6bbb45bbb73a0729022daa47197312c321 (diff) | |
| download | postgresql-736c95ca1647ae088c4c996218e8ef20a56b1795.tar.gz postgresql-736c95ca1647ae088c4c996218e8ef20a56b1795.zip | |
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.
Diffstat (limited to 'src')
| -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 b90a3f3889a..4fc99379916 100644 --- a/src/nls-global.mk +++ b/src/nls-global.mk @@ -76,7 +76,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 @@ -85,7 +85,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 |