--- lilypond-2.5.2-orig/mf/GNUmakefile	2006-03-08 07:23:56.000000000 +0100
+++ lilypond-2.5.2-orig/mf/GNUmakefile	2006-03-08 07:25:26.000000000 +0100
@@ -208,7 +208,7 @@ 
 	$(foreach i, $@, touch $i && ) true
 
 $(outdir)/%.pfa: $(outdir)/%.bla
-	$(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir $(basename $@))  && mv $(notdir $@) $(outdir)/
+	$(MFTRACE) -I $(outdir)/ --formats=PFA --simplify --keep-trying $(notdir $(basename $@))  && mv $(notdir $@) $(outdir)/
 
 $(outdir)/%.enc.in: %.enc
 	cp $< $@
--- lilypond-2.5.2-orig/stepmake/stepmake/metafont-rules.make	2006-03-08 07:23:56.000000000 +0100
+++ lilypond-2.5.2-orig/stepmake/stepmake/metafont-rules.make	2006-03-08 07:27:18.000000000 +0100
@@ -30,11 +30,11 @@ 
 
 
 $(outdir)/%.pfa: %.mf
-	$(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --simplify $(basename $(@F))
+	$(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --formats=PFA --simplify $(basename $(@F))
 	mv $(basename $(@F)).pfa $(outdir)
 
 $(outdir)/%.pfb: %.mf
-	$(MFTRACE)  $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --pfb --simplify  $(basename $(@F))
+	$(MFTRACE)  $(MFTRACE_FLAGS) -I $(outdir)/ --formats=PFA,PFB --simplify  $(basename $(@F))
 	-mv $(basename $(@F)).pfa $(outdir)
 	mv $(basename $(@F)).pfb $(outdir)