X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fpodir-targets.make;h=fd66e55809d79d6c30532090fa8b1d01dc9eb9aa;hb=84675bc536af363543bdae1fa422903a977e1ec8;hp=f225effd8fbf853391774d7df8a5554d72ffa253;hpb=bea7c2fcbe767a7fb57e96c021ddd087d59612a6;p=lilypond.git

diff --git a/stepmake/stepmake/podir-targets.make b/stepmake/stepmake/podir-targets.make
index f225effd8f..fd66e55809 100644
--- a/stepmake/stepmake/podir-targets.make
+++ b/stepmake/stepmake/podir-targets.make
@@ -1,28 +1,31 @@
-# Porules.make
 
-.SUFFIXES: .po .mo
+.SUFFIXES: .po .pot .mo
 
 $(outdir)/%.mo: %.po
 	$(MSGFMT) -o $@ $<
 
 # sed-pofile = sed 's/^. \#: .*//'
-sed-pofile = sed 's/^\#: .*//'
-sed-makestuff = sed 's/[a-zA-Z_/]*make\[[0-9]*\].*//'
-sed-edstuff = sed 's/[ \.,adic0-9]*//' | sed 's/---//' | sort -u
+sed-pofile = -e 's/^\#: .*//'
+sed-makestuff = -e 's/[a-zA-Z_/]*make\[[0-9]*\].*//'
+sed-edstuff = -e 's/[ \.,adic0-9]*//' -e 's/---//' | sort -u
+
 
 po-update:
 	$(foreach i,$(CATALOGS), \
-	  rm -f $(po-dir)/$(outdir)/$(i).po; \
-	  tupdate $(po-dir)/$(outdir)/$(package).po $(po-dir)/$(i).po \
-	    > $(po-dir)/$(outdir)/$(i).po && ) true
-	$(foreach i,$(CATALOGS), \
-	  changes=`$(MAKE) --silent -C $(po-dir) LANGUAGE=$$i po-changes $(ERROR_LOG) | $(sed-makestuff)`; \
+	  rm -f $(po-outdir)/$(i).po; \
+	  msgmerge $(po-srcdir)/$(i).po $(po-outdir)/$(package).po \
+	    -o $(po-outdir)/$(i).po && ) true
+	@$(foreach i,$(CATALOGS), \
+	  changes=`$(MAKE) --silent -C $(po-outdir)/.. LANGUAGE=$i po-changes $(ERROR_LOG) | sed $(sed-makestuff)`; \
 	  if test "$$changes" != "" ; then \
-	    echo "*** Changes for language $$i; check po/$(outdir)/$$i.po ***"; \
+	    echo "*** Changes for language $i; check $(po-outdir)/$i.po ***"; \
 	    echo -e "changes: \`$$changes'";\
 	  fi && ) true
 
 
 po-changes:
-	diff -e $(po-dir)/$(outdir)/$(LANGUAGE).po $(po-dir)/$(LANGUAGE).po \
-	  | $(sed-pofile) | $(sed-edstuff)
+	diff -e $(po-outdir)/$(LANGUAGE).po $(po-srcdir)/$(LANGUAGE).po \
+	  | sed $(sed-pofile) $(sed-edstuff)
+
+po-replace: po-update
+	mv $(outdir)/$(package).po $(package).pot