* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index c5f0567b9aa337f05d10ca467d150db38287c94a..8d1574848d5698bd83d3cbd23c7cc50d9c0d0ff6 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -38,38 +38,40 @@ TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
 ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES)
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
-INSTALLATION_DIR=$(datadir)/fonts/source
+INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source
 INSTALLATION_FILES=$(MF_FILES) $(AF_FILES)
 
 INSTALLATION_OUT_SUFFIXES=1 2 3 4 5
 
-INSTALLATION_OUT_DIR1=$(datadir)/tex
+INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex
 INSTALLATION_OUT_FILES1=$(TEXTABLES)
 
-INSTALLATION_OUT_DIR2=$(datadir)/fonts/afm
+INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/afm
 INSTALLATION_OUT_FILES2=$(AFM_FILES)
 
-INSTALLATION_OUT_DIR3=$(datadir)/fonts/tfm
+INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm
 INSTALLATION_OUT_FILES3=$(TFM_FILES)
 
 # comment this out if you don't want pfa's to be generated
 # making pfas takes a lot of CPU time. Let's skip it for now.
 #MAKE_PFA_FILES=1
 
-PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa)) $(outdir)/cmbxti8.pfa
+
+SAUTER_FONT_FILES=cmbxti7 cmbxti8 cmbxti12  cmbxti14 cmcsc7 cmcsc12 cmtt17 cmbx14 cmbx17
+PFA_FILES= $(addprefix $(outdir)/, $(addsuffix .pfa, $(SAUTER_FONT_FILES)) $(FONT_FILES:.mf=.pfa)) 
 
 ifdef MAKE_PFA_FILES
 ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map $(outdir)/fonts.scale
-INSTALLATION_OUT_DIR4=$(datadir)/fonts/type1
+INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/type1
 INSTALLATION_OUT_FILES4=$(PFA_FILES) $(outdir)/fonts.scale
 
-INSTALLATION_OUT_DIR5=$(datadir)/dvips/
+INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/dvips/
 INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map
 
 endif
 
 $(outdir)/lilypond.map: 
-       echo $(FONT_FILES:.mf=) | tr ' ' '\n' | \
+       echo $(notdir $(PFA_FILES:.pfa=)) | tr ' ' '\n' | \
                sed 's/\(.*\)/\1 \1 <\1.pfa/' > $@
 
 $(outdir)/fonts.scale:
@@ -89,9 +91,9 @@ local-clean:
        rm -f mfplain.mem mfplain.log 
        rm -f *.tfm *.log
 
-pfa: $(PFA_FILES)  
+pfa: $(PFA_FILES)   $(outdir)/lilypond.map $(outdir)/fonts.scale
 
 # needed for web documentation
-$(outdir)/cmbxti8.pfa:
-       $(PKTRACE)  -I $(outdir)/ --pfa --simplify --keep-trying cmbxti8
-       mv cmbxti8.pfa $(outdir)/
+$(addprefix $(outdir)/, $(SAUTER_FONT_FILES:=.pfa)):
+       $(foreach i, $(SAUTER_FONT_FILES), \
+               $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(i) && mv $(i).pfa $(outdir)/ && ) true