NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit30e749d

committed

Fix makefile logic to not break the build when xgettext is missing

xgettext is only required when make init-po is run manually; it is notrequired for a build. The intent to handle that was already there, butthe ifdef's were in the wrong place.

1 parent402e119 commit30e749dCopy full SHA for 30e749d

File tree

1 file changed

-4

lines changed

src
- nls-global.mk

1 file changed

-4

lines changed

`‎src/nls-global.mk`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,22 +45,26 @@ all-po: $(MO_FILES)`
`45`	`45`	`%.mo:%.po`
`46`	`46`	`$(MSGFMT) -o$@$<`
`47`	`47`
`48`		`-ifdefXGETTEXT`
`49`	`48`	`ifeq ($(word 1,$(GETTEXT_FILES)),+)`
`50`	`49`	`po/$(CATALOG_NAME).pot:$(word 2,$(GETTEXT_FILES))$(MAKEFILE_LIST)`
	`50`	`+ifdefXGETTEXT`
`51`	`51`	`$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) -f $<`
`52`	`52`	`else`
	`53`	`+@echo "You don't have 'xgettext'."; exit 1`
	`54`	`+endif`
	`55`	`+else # GETTEXT_FILES`
`53`	`56`	`po/$(CATALOG_NAME).pot:$(GETTEXT_FILES)$(MAKEFILE_LIST)`
`54`	`57`	`# Change to srcdir explicitly, don't rely on $^. That way we get`
`55`	`58`	`# consistent #: file references in the po files.`
	`59`	`+ifdefXGETTEXT`
`56`	`60`	`$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(GETTEXT_FILES)`
	`61`	`+else`
	`62`	`+@echo "You don't have 'xgettext'."; exit 1`
`57`	`63`	`endif`
	`64`	`+endif# GETTEXT_FILES`
`58`	`65`	`@$(MKDIR_P) $(dir $@)`
`59`	`66`	sed -e '1,18 { s/SOME DESCRIPTIVE TITLE./LANGUAGE message translation file for $(CATALOG_NAME)/;s/PACKAGE/PostgreSQL/g;s/VERSION/$(MAJORVERSION)/g;s/YEAR/'`date +%Y`'/g; }' messages.po >$@
`60`	`67`	`rm messages.po`
`61`		`-else# not XGETTEXT`
`62`		`-@echo "You don't have 'xgettext'."; exit 1`
`63`		`-endif# not XGETTEXT`
`64`	`68`
`65`	`69`
`66`	`70`	`# catalog name extentions must match behavior of PG_TEXTDOMAIN() in c.h`

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!

Commit30e749d

File tree

1 file changed

1 file changed

`‎src/nls-global.mk`

0 commit comments