*** empty log message ***

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index e3198a352f09030460b5f280038089cbddc5eca7..45b946f3d65219982bb17b56eed3955393d78839 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -10,7 +10,7 @@ depth = .
 # 
 SUBDIRS = buildscripts python scripts \
        elisp \
-       flower lily \
+       flower ttftool lily \
        mf ly tex ps scm \
        po make \
        cygwin debian stepmake \
@@ -41,7 +41,7 @@ doc:
        $(MAKE) -C Documentation
 
 install-WWW:
-       -$(INSTALL) -m 755 -d $(webdir) 
+       -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir) 
        tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
 # install-WWW does not recurse; fake it visiting Documentation/user manually
        $(MAKE) -C Documentation/user local-install-WWW
@@ -57,7 +57,7 @@ web-uninstall:
        $(MAKE) out=www uninstall-WWW=
 
 local-install:
-       $(INSTALL) -d $(local_lilypond_datadir)
+       $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
 
 final-install:
        @echo '*** Before using LilyPond, the contents of one of the login scripts'
@@ -66,7 +66,7 @@ final-install:
        @echo '*** when you log in.  So, please log out now and log in again.'
        @echo '*** For more information see Invoking LilyPond in the manual.'
 
-web-ext = gz html midi pdf png txt ly
+web-ext = html midi pdf png txt ly
 
 footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
 footifymail = MAILADDRESS=bug-lilypond@gnu.org
@@ -103,6 +103,7 @@ $(builddir)/share/lilypond-force:
        cd $(builddir) && rm -rf lib share
        mkdir -p $(builddir)/lib/$(package)
        mkdir -p $(builddir)/share/$(package)
+       mkdir -p $(builddir)/share/$(package)/dvips
        mkdir -p $(builddir)/share/$(package)/elisp
        mkdir -p $(builddir)/share/$(package)/fonts
        mkdir -p $(builddir)/share/$(package)/tex
@@ -110,7 +111,6 @@ $(builddir)/share/lilypond-force:
                ln -s  ../../python/$(outconfbase) python
        cd $(builddir)/share/$(package) && \
                ln -s $(abs-srcdir)/ly ly && \
-               ln -s ../../mf/$(outconfbase) dvips && \
                ln -s ../../mf/$(outconfbase) otf && \
                ln -s ../../mf/$(outconfbase) svg && \
                ln -s ../../mf/$(outconfbase) tfm && \
@@ -118,12 +118,17 @@ $(builddir)/share/lilypond-force:
                ln -s $(abs-srcdir)/ps && \
                ln -s ../../python/$(outconfbase) python && \
                ln -s $(abs-srcdir)/scm
+       cd $(builddir)/share/$(package)/dvips && \
+               ln -s ./../mf/$(outconfbase) mf-out && \
+               ln -s $(abs-srcdir)/ps
        cd $(builddir)/share/$(package)/tex && \
                ln -s $(abs-srcdir)/tex source && \
                ln -s ../../../tex/$(outconfbase) tex-out && \
                ln -s ../../../mf/$(outconfbase) mf-out
        cd $(builddir)/share/$(package)/fonts && \
                ln -s $(abs-srcdir)/mf source && \
+               ln -s ../../../tex/$(outconfbase) enc && \
+               ln -s ../../../mf/$(outconfbase) map && \
                ln -s ../../../mf/$(outconfbase) otf && \
                ln -s ../../../mf/$(outconfbase) tfm && \
                ln -s ../../../mf/$(outconfbase) svg && \