From: hanwen Date: Tue, 23 Sep 2003 13:55:51 +0000 (+0000) Subject: * Documentation/topdocs/INSTALL.texi (Top): add note about get-pfa X-Git-Tag: release/2.1.3~91 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=81c21675d635988e02c68e4966532d4184698b59;p=lilypond.git * Documentation/topdocs/INSTALL.texi (Top): add note about get-pfa target. * mf/GNUmakefile: add get-pfa, get-debian-pfa, get-rpm-pfa targets. * GNUmakefile.in ($(config_h)): config.h should depend on config.hh.in . (lilypond.words): remove fontball stuff. * GNUmakefile.in (rsync-web): permissions and ownership for website. --- diff --git a/ChangeLog b/ChangeLog index be6c0ef4e6..03dfe70df7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,14 @@ 2003-09-23 Han-Wen Nienhuys + * Documentation/topdocs/INSTALL.texi (Top): add note about get-pfa + target. + + * mf/GNUmakefile: add get-pfa, get-debian-pfa, get-rpm-pfa + targets. + * GNUmakefile.in ($(config_h)): config.h should depend on config.hh.in . + (lilypond.words): remove fontball stuff. * stepmake/aclocal.m4: only print config.cache warning if it exists. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 9db4fcd377..28690c8fcd 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -102,7 +102,7 @@ Also, @TeX{}'s libkpathsea is used to find the fonts (@file{.mf}, (1.0.6 is known to work). You may need to install a tetex-devel (or tetex-dev or libkpathsea-dev) package too. -@item @uref{ftp://ftp.gnu.org/gnu/texinfo/,Texinfo} (version 4.2 or newer). +@item @uref{ftp://ftp.gnu.org/gnu/texinfo/,Texinfo} (version 4.6 or newer). @item The @uref{ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/supported/geometry,geometry @@ -151,7 +151,7 @@ documentation is built by issuing: Building the website requires some additional tools: @itemize @bullet -@item The @uref{http://netpbm.sourceforge.net/,netpbm utilities} see +@item The @uref{http://netpbm.sourceforge.net/,netpbm utilities} @item ImageMagick @end itemize @@ -175,29 +175,14 @@ make install sh buildscripts/clean-fonts.sh @end example -If, in addition, you want to generate PDF files of your scores and have -installed mftrace, type -@example -make pfa-fonts -make install-pfa-fonts -texhash -@end example - -PFA versions of the fonts for the latest LilyPond version can also be -obtained from the internet: download the .deb file that corresponds to -your version, eg. +The most time-consuming part of compiling LilyPond is tracing the +Type1 fonts. You can shortcut this operation by issuing +one of the following commands: @example -wget http://ftp.us.debian.org/debian/pool/main/l/lilypond/lilypond_1.8.0-1_i386.deb -@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 + make -C mf get-pfa # requires rpm2cpio + make -C mf get-debian-pfa # may not be up to date @end example -If you are installing LilyPond somewhere else, unpack the appropriate -files as shown, and move them to the appropriate paths. Of course, the -.deb version number should correspond to what you are installing. If you are doing an upgrade, you should remove all @file{feta} @code{.pk} and @code{.tfm} files. A script has been provided to do the @@ -224,7 +209,7 @@ option of configure. You should use @samp{make conf=CONF} to generate the output in @file{out-CONF}. Example: Suppose I want to build with and without profiling. Then I'd use the following for the normal build: -@c prefix=~ ? + @example ./configure --prefix=$HOME/usr/ --enable-checking make diff --git a/GNUmakefile.in b/GNUmakefile.in index ee0e344c60..014ca0b81c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -33,32 +33,6 @@ include $(depth)/make/stepmake.make doc: $(MAKE) -C Documentation -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 $< - lilypond.words: cd $(builddir) && $(PYTHON) $(buildscript-dir)/lilypond.words.py $(outdir) @@ -172,5 +146,5 @@ rsync-web: chgrp -R lilypond . && \ chmod -R 664 . && \ chmod 2775 `find -type d` . && \ - rsync --group --delete --stats --progress -gorltvu -e ssh . x:/var/www/lilypond/doc/v1.9/ + rsync --delete --stats --progress -gorltvu -e ssh . x:/var/www/lilypond/doc/v1.9/ cd out-www && rm -rf web/ diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 6d3b0f3ba9..4d273d75f6 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -71,6 +71,30 @@ export MFINPUTS:=.:$(MFINPUTS) default: $(ALL_GEN_FILES) + +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) + +get-debian-pfa: $(outdir)/$(debian-package) + rm -rf $(outdir)/./usr + ar p $< data.tar.gz | \ + tar -C $(outdir) -zvxf - '*.pfa' + cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/ + + +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) + +get-rpm-pfa: $(outdir)/$(redhat-package) + cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -id '*.pfa' + cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/ + +# change this dependency +get-pfa: get-rpm-pfa + ## ## todo: this also depends on .tfm, FIXME. $(outdir)/%.afm $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm