Merge branch 'master' into lilypond/translation

[lilypond.git] / stepmake / stepmake / podir-targets.make

diff --git a/stepmake/stepmake/podir-targets.make b/stepmake/stepmake/podir-targets.make
index f225effd8fbf853391774d7df8a5554d72ffa253..0b831c5c797b622a230d2d80ea0be2a3c80bd99a 100644 (file)
--- a/stepmake/stepmake/podir-targets.make
+++ b/stepmake/stepmake/podir-targets.make
@@ -1,28 +1,32 @@
-# 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)`; \
+         msgmerge $(po-dir)/$(i).po $(po-dir)/$(outdir)/$(package).po \
+           -o $(po-dir)/$(outdir)/$(i).po && ) true
+       @$(foreach i,$(CATALOGS), \
+         changes=`$(MAKE) --silent -C $(po-dir) 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)
+         | sed $(sed-pofile) $(sed-edstuff)
+
+po-replace: po-update
+       mv $(outdir)/$(package).po $(package).pot
+       mv $(outdir)/*.po .