(get-*-fonts): Rename from get-*-pfa. Copy SVG

too.

diff --git a/ChangeLog b/ChangeLog
index 65c18225b9237c1cff72ed7a8a177e20fa978c61..ea6d38502ac1cb4302feab03d810e538f9c03c62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-11  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * mf/GNUmakefile (get-*-fonts): Rename from get-*-pfa.  Copy SVG
+       too.
+
        * Documentation/topdocs/NEWS.tely (Top): Add slur script feature.
 
        * lily/lily-guile.cc (parse_symbol_list): Rewrite.  Grok multiple

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index b31fb4f747804f2e00b225b907906fe23e81389c..5434ddc0c4118c5f22fbf1c8024826b7c2f91f6d 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -181,13 +181,13 @@ ifneq ($(shell $(MFTRACE) --version | sed 's/ .*//'),mftrace)
        @echo ""
        @echo "ERROR: mftrace not found"
        @echo ""
-       @echo "For obtaining PFA fonts, either install mftrace "
+       @echo "For obtaining PFA/SVG fonts, either install mftrace "
        @echo "(see http://www.xs4all.nl/~hanwen/mftrace/ ),"
        @echo "or try one of the following commands in this directory: "
        @echo ""
-       @echo " make get-pfa "
-       @echo " make get-rpm-pfa "
-       @echo " make get-deb-pfa "
+       @echo " make get-fonts "
+       @echo " make get-rpm-fonts "
+       @echo " make get-deb-fonts "
        @echo ""
        @echo "These commands will try to download the files from internet."
        @false
@@ -199,24 +199,25 @@ debian-package =lilypond_$(TOPLEVEL_VERSION)-1_i386.deb
 $(outdir)/$(debian-package):
        wget --passive-ftp -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package)
 
-get-deb-pfa: $(outdir)/$(debian-package)
+get-deb-fonts: $(outdir)/$(debian-package)
        rm -rf $(outdir)/./usr
        ar p $< data.tar.gz | \
-               tar -C $(outdir) -zvxf - '*.pfa'
-       cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/
+               tar -C $(outdir) -zvxf - '*.pfa' '*.svg'
+       cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/
 
 
 redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm
 $(outdir)/$(redhat-package):
        wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-4/$(redhat-package)
 
-get-rpm-pfa: $(outdir)/$(redhat-package)
+get-rpm-fonts: $(outdir)/$(redhat-package)
        cd $(outdir) ; rm -rf usr/ # (root alert!) 
-       cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa'
-       cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/
+       cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' '*.svg'
+       cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/
 
 # change this dependency 
-get-pfa: get-rpm-pfa
+get-fonts: get-rpm-fonts
+get-pfa: get-rpm-fonts
 
 
 ##