NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit736c95c

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 parenta6dacf6 commit736c95cCopy full SHA for 736c95c

File tree

1 file changed

-2

lines changed

src
- nls-global.mk

1 file changed

-2

lines changed

`‎src/nls-global.mk`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ all-po: $(MO_FILES)`
`76`	`76`	`ifeq ($(word 1,$(GETTEXT_FILES)),+)`
`77`	`77`	`po/$(CATALOG_NAME).pot:$(word 2,$(GETTEXT_FILES))$(MAKEFILE_LIST)`
`78`	`78`	`ifdefXGETTEXT`
`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 $<`
`80`	`80`	`else`
`81`	`81`	`@echo "You don't have 'xgettext'."; exit 1`
`82`	`82`	`endif`
`@@ -85,7 +85,7 @@ po/$(CATALOG_NAME).pot: $(GETTEXT_FILES) $(MAKEFILE_LIST)`
`85`	`85`	`# Change to srcdir explicitly, don't rely on $^. That way we get`
`86`	`86`	`# consistent #: file references in the po files.`
`87`	`87`	`ifdefXGETTEXT`
`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)`
`89`	`89`	`else`
`90`	`90`	`@echo "You don't have 'xgettext'."; exit 1`
`91`	`91`	`endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit736c95c

File tree

1 file changed

1 file changed

`‎src/nls-global.mk`

0 commit comments