|
1 | | -# $PostgreSQL: pgsql/src/nls-global.mk,v 1.19 2009/01/15 09:01:24 petere Exp $ |
| 1 | +# $PostgreSQL: pgsql/src/nls-global.mk,v 1.20 2009/01/20 09:58:50 petere Exp $ |
2 | 2 |
|
3 | 3 | # Common rules for Native Language Support (NLS) |
4 | 4 | # |
@@ -113,10 +113,12 @@ update-po: $(ALL_LANGUAGES:%=po/%.po.new) |
113 | 113 | $(AVAIL_LANGUAGES:%=po/%.po.new): po/%.po.new: po/%.po po/$(CATALOG_NAME).pot$(all_compendia) |
114 | 114 | $(MSGMERGE) $(word 1, $^) $(word 2,$^) -o $@ $(addprefix --compendium=,$(filter %/$*.po,$(wordlist 3,$(words $^),$^))) |
115 | 115 |
|
116 | | -# For languages not yet available, merge against empty file, to pick |
117 | | -# up translations from the compendia. |
| 116 | +# For languages not yet available, merge against oneself, to pick |
| 117 | +# up translations from the compendia. (Merging against /dev/null |
| 118 | +# doesn't work so well; it inserts the headers from the first-named |
| 119 | +# compendium.) |
118 | 120 | po/%.po.new: po/$(CATALOG_NAME).pot$(all_compendia) |
119 | | -$(MSGMERGE)/dev/null$(word 1,$^) -o$@$(addprefix --compendium=,$(filter%/$*.po,$(wordlist 2,$(words$^),$^))) |
| 121 | +$(MSGMERGE)$(word 1,$^)$(word 1,$^) -o$@$(addprefix --compendium=,$(filter%/$*.po,$(wordlist 2,$(words$^),$^))) |
120 | 122 |
|
121 | 123 |
|
122 | 124 | all: all-po |
|