Skip to content

Commit 736c95c

Browse files
committed
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.
1 parent a6dacf6 commit 736c95c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/nls-global.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ all-po: $(MO_FILES)
7676
ifeq ($(word 1,$(GETTEXT_FILES)),+)
7777
po/$(CATALOG_NAME).pot: $(word 2, $(GETTEXT_FILES)) $(MAKEFILE_LIST)
7878
ifdef XGETTEXT
79-
$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) -f $<
79+
$(XGETTEXT) -D $(srcdir) -D . -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) -f $<
8080
else
8181
@echo "You don't have 'xgettext'."; exit 1
8282
endif
@@ -85,7 +85,7 @@ po/$(CATALOG_NAME).pot: $(GETTEXT_FILES) $(MAKEFILE_LIST)
8585
# Change to srcdir explicitly, don't rely on $^. That way we get
8686
# consistent #: file references in the po files.
8787
ifdef XGETTEXT
88-
$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) $(GETTEXT_FILES)
88+
$(XGETTEXT) -D $(srcdir) -D . -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) $(GETTEXT_FILES)
8989
else
9090
@echo "You don't have 'xgettext'."; exit 1
9191
endif

0 commit comments

Comments
 (0)