* scm/font.scm (paper20-font-vector): add bold-narrow series (only

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 3ccf89cfdfe92948c9d3777b3d3b56ce9e81208b..19583e3c72ce30d163a7e113191aaf4282cc7925 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -50,9 +50,8 @@ INSTALLATION_OUT_FILES2=$(AFM_FILES)
 INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm
 INSTALLATION_OUT_FILES3=$(TFM_FILES)
 
-SAUTER_FONTS = cmbxti7 cmbxti8 cmbxti12 cmbxti14 \
-       cmcsc7 cmcsc12 cmtt17 cmbx14 cmbx17 cmtt6 cmbx6 cmbx5 cmbxti5 \
-       cmti6 cmti5  cmss5 cmss6 cmss7
+
+SAUTER_FONTS = cmbxti8
 
 ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)
 
@@ -93,7 +92,7 @@ endif
 debian-mirror=http://ftp.us.debian.org
 debian-package =lilypond_$(TOPLEVEL_VERSION)-1_i386.deb
 $(outdir)/$(debian-package):
-       wget -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package)
+       wget --passive-ftp -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package)
 
 get-deb-pfa: $(outdir)/$(debian-package)
        rm -rf $(outdir)/./usr
@@ -105,9 +104,10 @@ get-deb-pfa: $(outdir)/$(debian-package)
 
 redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm
 $(outdir)/$(redhat-package):
-       wget -P $(outdir) ftp://ftp.lilypond.org/pub/LilyPond/binaries/RedHat-9/$(redhat-package)
+       wget  --passive-ftp -P $(outdir) ftp://ftp.lilypond.org/pub/LilyPond/binaries/RedHat-9/$(redhat-package)
 
 get-rpm-pfa: $(outdir)/$(redhat-package)
+       cd $(outdir) ; rm -rf usr/ # (root alert!) 
        cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa'
        touch $(addprefix $(outdir)/, $(addsuffix .bla,$(SAUTER_FONTS)))
        cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/
@@ -118,7 +118,7 @@ get-pfa: get-rpm-pfa
 
 ##
 ## todo: this also depends on .tfm, FIXME.
-$(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm $(outdir)/%list.ly
+$(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
        $(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm)  --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
 
 fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir)