* Documentation/topdocs/INSTALL.texi: Explain install-pfa-fonts.

* GNUmakefile.in (install-pfa-fonts):
(get-pfa-fonts): New target.

* stepmake/stepmake/toplevel-targets.make: Add pfa-fonts and
install-pfa-fonts help.

diff --git a/ChangeLog b/ChangeLog
index 02922cea43e4069cffdb3633b161d68a073890d9..1c7602d138afc667ae391211db4d059340381537 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-28  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * Documentation/topdocs/INSTALL.texi: Explain install-pfa-fonts.
+
+       * GNUmakefile.in (install-pfa-fonts):
+       (get-pfa-fonts): New target.
+
+       * stepmake/stepmake/toplevel-targets.make: Add pfa-fonts and
+       install-pfa-fonts help.
+
 2003-08-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * python/lilylib.py (read_pipe): only store and display error log

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 9a0c565c0e4806845c20d058e827862a54975272..11eddc48adc33b1a8fac8531682092b204399973 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -190,7 +190,7 @@ If, in addition, you want to generate PDF files of your scores and have
 installed mftrace, type
 @example 
 make pfa-fonts
-make MAKE_PFA_FILES=1 install
+make install-pfa-fonts
 texhash
 @end example 
 
@@ -200,9 +200,10 @@ your version, eg.
 
 @example
 wget http://ftp.us.debian.org/debian/pool/main/l/lilypond/lilypond_1.8.0-1_i386.deb
-ar x lilypond_1.8.0.-1_i386.deb
-tar -C / -zxf  data.tar.gz /usr/share/lilypond/1.8.0/fonts/type1/
-tar -C / -zxf  data.tar.gz /usr/share/lilypond/1.8.0/dvips/
+@c ar p lilypond_1.8.0-1_i386.deb data.tar.gz | tar -C / -zxf - '.*.pfa' '.*.map'
+ar x lilypond_1.8.0-1_i386.deb data.tar.gz
+tar -C / -zxf data.tar.gz /usr/share/lilypond/1.8.0/fonts/type1/
+tar -C / -zxf data.tar.gz /usr/share/lilypond/1.8.0/dvips/
 texhash
 @end example
 If you are installing LilyPond somewhere else, unpack the appropriate

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 6667cc4b2e726dcb48897a340b57213f3ceeaa15..2c5aa22eb9f7e401cfa3636e1592ce2acd844bfe 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -37,6 +37,28 @@ pfa-fonts:
        $(MAKE) MAKE_PFA_FILES=1 -C mf
 # don't make fontball - we have binary packages for that.
 
+install-pfa-fonts:
+       $(MAKE) MAKE_PFA_FILES=1 -C mf install
+
+fontball=type1-$(TOPLEVEL_VERSION).tar.gz
+deb=lilypond_$(TOPLEVEL_VERSION)-1_i386.deb
+debian-mirror=http://ftp.$(LANG).debian.org
+
+$(outdir)/$(deb):
+       wget -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(deb)
+
+#lld=.$(local_lilypond_datadir)
+lld=./usr/share/lilypond/$(TOPLEVEL_VERSION)
+$(outdir)/$(fontball): $(outdir)/$(deb)
+       rm -rf $(outdir)/./usr
+       ar p $< data.tar.gz | \
+               tar -C $(outdir) -zxf - $(lld)/dvips $(lld)/fonts/type1
+       # strip the $(lld) part?
+       tar -C $(outdir) -czf $@ ./usr
+
+get-pfa-fonts: $(outdir)/$(fontball)
+       # install by hand from $<
+
 web-install: 
        -$(INSTALL) -m 755 -d $(webdir) 
        tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 3ebbeb2c507fc3162d11aea72114ae3a0a776b55..9670c1b8b0ff051d5434a7473dd7c6a0006c9607 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -73,6 +73,9 @@ local-help:
   release     roll tarball and generate patch\n\
   rpm         build rpm (Red Hat) package\n\
   rpm-mdk     build rpm (Mandrake) packages\n\
+  pfa-fonts   build type1 fonts in mf/$(outdir)\n\
+  install-pfa-fonts install type1 fonts in $(local_lilypond_datadir)/fonts/\n\
+  po          make new translation Portable Object database\n\
   po          make new translation Portable Object database\n\
   po-replace  do po-update and replace catalogs with msgmerged versions\n\
   po-update   update translation Portable Object database\n\