Imported Upstream version 2.16.0

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

diff --git a/stepmake/stepmake/podir-targets.make b/stepmake/stepmake/podir-targets.make
index 0b831c5c797b622a230d2d80ea0be2a3c80bd99a..fd66e55809d79d6c30532090fa8b1d01dc9eb9aa 100644 (file)
--- a/stepmake/stepmake/podir-targets.make
+++ b/stepmake/stepmake/podir-targets.make
@@ -12,21 +12,20 @@ sed-edstuff = -e 's/[ \.,adic0-9]*//' -e 's/---//' | sort -u
 
 po-update:
        $(foreach i,$(CATALOGS), \
-         rm -f $(po-dir)/$(outdir)/$(i).po; \
-         msgmerge $(po-dir)/$(i).po $(po-dir)/$(outdir)/$(package).po \
-           -o $(po-dir)/$(outdir)/$(i).po && ) true
+         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-dir) LANGUAGE=$i po-changes $(ERROR_LOG) | sed $(sed-makestuff)`; \
+         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 \
+       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
-       mv $(outdir)/*.po .