Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/lilypond

diff --combined stepmake/stepmake/metafont-rules.make
index 84f1dba059f36ee712b5d9de935c80dd1d35ee35,ec5e78c96ca18128eabfbbc815cf5743fc8b3f74..75fb84cb6775842c57829e7d0f58dcd1c3d0315e
--- 1/stepmake/stepmake/metafont-rules.make
--- 2/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@@ -19,9 -19,9 +19,9 @@@ $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.
        TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` ; \
                ( cd $$TMP ; \
                ln -s ../mf2pt1.mem . ; \
 -              MFINPUTS=../..:../:: $(PERL) ../../$(buildscript-dir)/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) ; \
 +              MFINPUTS=../..:../:: $(PERL) $(top-src-dir)/buildscripts)/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) ; \
                mv $$TMP/*pfb $(outdir) ; \
                rm -rf $$TMP
  
- $(outdir)/mf2pt1.mem:
-       cd $(outdir) && mpost -progname=mpost -ini ../mf2pt1 \\dump
+ $(outdir)/mf2pt1.mem: mf2pt1.mp
+       cd $(outdir) && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump