diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-01-20 09:58:50 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-01-20 09:58:50 +0000 |
| commit | b287f0a39eafbd99dd9ac8e83a58234604961b0d (patch) | |
| tree | 34bd37ee1f6973b1f9cd5d7b2f06f235c1e540ec /src | |
| parent | 93a6be63a55a8cd0d73b3fa81eb6a46013a3a974 (diff) | |
| download | postgresql-b287f0a39eafbd99dd9ac8e83a58234604961b0d.tar.gz postgresql-b287f0a39eafbd99dd9ac8e83a58234604961b0d.zip | |
Do not msgmerge against /dev/null; merge against the pot file itself
instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nls-global.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nls-global.mk b/src/nls-global.mk index d4c47b0562d..da131d067c8 100644 --- a/src/nls-global.mk +++ b/src/nls-global.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/nls-global.mk,v 1.19 2009/01/15 09:01:24 petere Exp $ +# $PostgreSQL: pgsql/src/nls-global.mk,v 1.20 2009/01/20 09:58:50 petere Exp $ # Common rules for Native Language Support (NLS) # @@ -113,10 +113,12 @@ update-po: $(ALL_LANGUAGES:%=po/%.po.new) $(AVAIL_LANGUAGES:%=po/%.po.new): po/%.po.new: po/%.po po/$(CATALOG_NAME).pot $(all_compendia) $(MSGMERGE) $(word 1, $^) $(word 2,$^) -o $@ $(addprefix --compendium=,$(filter %/$*.po,$(wordlist 3,$(words $^),$^))) -# For languages not yet available, merge against empty file, to pick -# up translations from the compendia. +# For languages not yet available, merge against oneself, to pick +# up translations from the compendia. (Merging against /dev/null +# doesn't work so well; it inserts the headers from the first-named +# compendium.) po/%.po.new: po/$(CATALOG_NAME).pot $(all_compendia) - $(MSGMERGE) /dev/null $(word 1,$^) -o $@ $(addprefix --compendium=,$(filter %/$*.po,$(wordlist 2,$(words $^),$^))) + $(MSGMERGE) $(word 1,$^) $(word 1,$^) -o $@ $(addprefix --compendium=,$(filter %/$*.po,$(wordlist 2,$(words $^),$^))) all: all-po |