-# comment these out if you don't want pfa's to be generated
-# or you don't have metapost.
-INSTALLATION_OUT_DIR4=$(datadir)/pfa
-INSTALLATION_OUT_FILES4=$(PFA_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
+
+
+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=$(local_lilypond_datadir)/fonts/type1
+INSTALLATION_OUT_FILES4=$(PFA_FILES) $(outdir)/fonts.scale
+
+INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/dvips/
+INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map
+
+endif
+
+$(outdir)/lilypond.map:
+ echo $(notdir $(PFA_FILES:.pfa=)) | tr ' ' '\n' | \
+ sed 's/\(.*\)/\1 \1 <\1.pfa/' > $@
+
+$(outdir)/fonts.scale:
+ echo $(FONT_FILES:.mf=.pfa) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py > $@
+