From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 20 Jan 2009 09:58:50 +0000 (+0000)
Subject: Do not msgmerge against /dev/null; merge against the pot file itself
X-Git-Tag: recoveryinfrav9~14
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=290fd9389d980ec1d70732f12257a60c23701d5a;p=users%2Fsimon%2Fpostgres.git

Do not msgmerge against /dev/null; merge against the pot file itself
instead.
---

diff --git a/src/nls-global.mk b/src/nls-global.mk
index 549574ca47..46f4698587 100644
--- a/src/nls-global.mk
+++ b/src/nls-global.mk
@@ -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