X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fpodir-targets.make;h=fd66e55809d79d6c30532090fa8b1d01dc9eb9aa;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=d64120b6ddc8b292d013bce4af3afaf31c706f5d;hpb=701c5e3d2e865da2a464b6460a30f14f061089ea;p=lilypond.git

diff --git a/stepmake/stepmake/podir-targets.make b/stepmake/stepmake/podir-targets.make
index d64120b6dd..fd66e55809 100644
--- a/stepmake/stepmake/podir-targets.make
+++ b/stepmake/stepmake/podir-targets.make
@@ -1,4 +1,3 @@
-# Porules.make
 
 .SUFFIXES: .po .pot .mo
 
@@ -13,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 .