* mf/feta-toevallig.mf: tweak for bottom of flat sign.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 242c59b7123424c992e276d0b498f1c5f43e685e..710db8f04c5dd3270da7f122f7e518c7d318ee0a 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -53,16 +53,16 @@ web-doc: web-reqs
 
 pfa-fonts:
        $(MAKE) MAKE_PFA_FILES=1 -C mf
+       (cd $(builddir)/share/lilypond/fonts && \
+               tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* )
 
-docdir = $(prefix)/share/doc/lilypond-$(TOPLEVEL_VERSION)
-install-html-doc: html-doc
-       $(INSTALL) -d $(docdir)/html 
-       tar -C $(docdir)/html -zxf $(outdir)/web.tar.gz
+install-html-doc: web-doc top-web
+       $(INSTALL) -m 755 -d $(local_package_docdir) 
+       tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
 
 # KPATHSEA=0: Hack for compiling without kpathsea -- not recommended
 my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp 
 
-
 local-install:
        $(INSTALL) -d $(local_lilypond_datadir)
 ifeq ($(KPATHSEA),0)
@@ -90,6 +90,7 @@ lily/$(outdir)/lilypond:
 
 local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
+
 web-ext = gz html midi pdf png txt ly
 top-web:
        cd $(builddir) && rm -f `find . -name \*.html~ -print`
@@ -132,10 +133,13 @@ CATALOGS = $(HELP_CATALOGS:lilypond=)
 
 $(builddir)/share/lilypond-force:
 # Preparing LilyPond tree for builddir exec
-       cd $(builddir) && rm -rf share
+       cd $(builddir) && rm -rf lib share
+       mkdir -p $(builddir)/lib/lilypond
        mkdir -p $(builddir)/share/lilypond
        mkdir -p $(builddir)/share/lilypond/fonts
        mkdir -p $(builddir)/share/lilypond/tex
+       cd $(builddir)/lib/lilypond && \
+               ln -s  ../../python/$(outconfbase) python
        cd $(builddir)/share/lilypond && \
                ln -s $(abs-srcdir)/ly ly && \
                ln -s ../../mf/$(outconfbase) dvips && \