Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb5dd25b

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 inGETTEXT_FILES, leading to failure to construct the .pot files. This hasbit me all along, but never hard enough to get it fixed; I suppose not alot 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 parent5f3e0e8 commitb5dd25b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎src/nls-global.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ all-po: $(MO_FILES)
7373
ifeq ($(word 1,$(GETTEXT_FILES)),+)
7474
po/$(CATALOG_NAME).pot:$(word 2,$(GETTEXT_FILES))$(MAKEFILE_LIST)
7575
ifdefXGETTEXT
76-
$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) -f $<
76+
$(XGETTEXT) -D $(srcdir) -D . -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) -f $<
7777
else
7878
@echo "You don't have 'xgettext'."; exit 1
7979
endif
@@ -82,7 +82,7 @@ po/$(CATALOG_NAME).pot: $(GETTEXT_FILES) $(MAKEFILE_LIST)
8282
# Change to srcdir explicitly, don't rely on $^. That way we get
8383
# consistent #: file references in the po files.
8484
ifdefXGETTEXT
85-
$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) $(GETTEXT_FILES)
85+
$(XGETTEXT) -D $(srcdir) -D . -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) $(GETTEXT_FILES)
8686
else
8787
@echo "You don't have 'xgettext'."; exit 1
8888
endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp