make all fails because of metafont rules

[John Mandereau]

Hi,

'make all' fails for me with current Git master.  The first patch below
fixes the problem for me, but I guess it might not work for builds with
different build dir and source dir (i.e. for GUB?), so I propose a
second patch that should work in all cases.

%%%%%%% PATCH 1 %%%%%%%%%%%%
diff --git a/stepmake/stepmake/metafont-rules.make 
b/stepmake/stepmake/metafont-rules.make
index 50bc007..28610d3 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -18,8 +18,8 @@ $(outdir)/%.tfm $(outdir)/%.log: %.mf
 $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
        TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` ; \
                ( cd $$TMP ; \
-               ln -s $(outdir)/mf2pt1.mem . ; \
-               MFINPUTS=$(src-dir):$(outdir):: $(PERL) 
$(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) ; 
+               ln -s ../../$(outdir)/mf2pt1.mem . ; \
+               MFINPUTS=../../$(src-dir):../../$(outdir):: $(PERL) 
$(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTI
                mv $$TMP/*pfb $(outdir) ; \
                rm -rf $$TMP
 
%%%%%%%%%%%%%%%%%%%%%%%%%%%

%%%%%%% PATCH 2 %%%%%%%%%%%
diff --git a/stepmake/stepmake/metafont-rules.make 
b/stepmake/stepmake/metafont-rules.make
index 50bc007..28610d3 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -18,8 +18,8 @@ $(outdir)/%.tfm $(outdir)/%.log: %.mf
 $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
        TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` ; \
                ( cd $$TMP ; \
-               ln -s $(outdir)/mf2pt1.mem . ; \
-               MFINPUTS=$(src-dir):$(outdir):: $(PERL) 
$(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) ; 
+               ln -s $(top-build-dir)/mf/$(outdir)/mf2pt1.mem . ; \
+               MFINPUTS=$(top-src-dir)/mf:$(top-build-dir)/mf/$(outdir):: 
$(PERL) $(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTI
                mv $$TMP/*pfb $(outdir) ; \
                rm -rf $$TMP
 
%%%%%%%%%%%%%%%%%%%%%%%%%%%

Cheers,
John