* lily/modified-font-metric.cc (text_dimension): try

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 62b9f40e7d89fcef9b14de7c9cae02eda7d22f10..e3198a352f09030460b5f280038089cbddc5eca7 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -14,17 +14,20 @@ SUBDIRS = buildscripts python scripts \
        mf ly tex ps scm \
        po make \
        cygwin debian stepmake \
-       Documentation input
+       Documentation input \
+       vim 
 #
 
+include VERSION
+package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
+
 SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh
 README_FILES = ChangeLog  COPYING DEDICATION ROADMAP THANKS 
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
 IN_FILES := $(wildcard *.in)
 PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
-VIM_FILES = vim/filetype.vim vim/compiler/lilypond.vim vim/ftplugin/lilypond.vimvim/indent/lilypond.vim vim/syntax/lilypond.vim
-EXTRA_DIST_FILES = VERSION .cvsignore $(README_FILES) $(SCRIPTS) $(IN_FILES) \
-  $(PATCH_FILES) $(VIM_FILES)
+EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -42,10 +45,10 @@ install-WWW:
        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
+       $(MAKE) -C Documentation/user install-info
 
 web-install:
        $(MAKE) out=www install-WWW
-       $(MAKE) out=www 
 
 uninstall-WWW:
        #TODO
@@ -57,20 +60,21 @@ local-install:
        $(INSTALL) -d $(local_lilypond_datadir)
 
 final-install:
-       @echo
-       @echo " *** Before running, buildscripts/out/lilypond-{profile,login}"
-       @echo " *** must be run. You're advised to source these scripts from your "
-       @echo " *** login scripts. For more information, see Invoking LilyPond in the manual."
-       @echo
+       @echo '*** Before using LilyPond, the contents of one of the login scripts'
+       @echo '*** buildscripts/out/lilypond-{profile,login} should be sourced.'
+       @echo '*** LilyPond should have been installed to do that automatically'
+       @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
 
-footify = MAILADDRESS=bug-lilypond@gnu.org  $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+footifymail = MAILADDRESS=bug-lilypond@gnu.org
 
 local-WWW-post:
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
-       cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
-       cd $(builddir) && rm -f `find . -name \*.html~ -print`
+       cd $(builddir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
+       cd $(builddir) && find . -name \*.html~ -print | xargs rm -f
        cd $(builddir) && find Documentation input \
                $(web-ext:%=-path '*/out-www/*.%' -or) -false \
                > $(outdir)/weblist
@@ -82,11 +86,6 @@ local-WWW-post:
 
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
-# FIXME: rename to TAGS; should include deeper TAGS files, see guile-core
-ALL-TAGS:
-       etags $(shell find . $(src-ext:%=-name '*.%' -or) -false \
-               | grep -v '/out')
-
 web-clean:
        $(MAKE) out=www clean
        $(MAKE) $(builddir)/share/lilypond-force
@@ -102,32 +101,35 @@ CATALOGS = $(HELP_CATALOGS:lilypond=)
 $(builddir)/share/lilypond-force:
 # Preparing LilyPond tree for builddir exec
        cd $(builddir) && rm -rf lib share
-       mkdir -p $(builddir)/lib/lilypond
-       mkdir -p $(builddir)/share/lilypond
-       mkdir -p $(builddir)/share/lilypond/elisp
-       mkdir -p $(builddir)/share/lilypond/fonts
-       mkdir -p $(builddir)/share/lilypond/tex
-       cd $(builddir)/lib/lilypond && \
+       mkdir -p $(builddir)/lib/$(package)
+       mkdir -p $(builddir)/share/$(package)
+       mkdir -p $(builddir)/share/$(package)/elisp
+       mkdir -p $(builddir)/share/$(package)/fonts
+       mkdir -p $(builddir)/share/$(package)/tex
+       cd $(builddir)/lib/$(package) && \
                ln -s  ../../python/$(outconfbase) python
-       cd $(builddir)/share/lilypond && \
+       cd $(builddir)/share/$(package) && \
                ln -s $(abs-srcdir)/ly ly && \
                ln -s ../../mf/$(outconfbase) dvips && \
-               ln -s ../../mf/$(outconfbase) afm && \
+               ln -s ../../mf/$(outconfbase) otf && \
+               ln -s ../../mf/$(outconfbase) svg && \
                ln -s ../../mf/$(outconfbase) tfm && \
                ln -s $(abs-srcdir)/mf && \
                ln -s $(abs-srcdir)/ps && \
                ln -s ../../python/$(outconfbase) python && \
                ln -s $(abs-srcdir)/scm
-       cd $(builddir)/share/lilypond/tex && \
+       cd $(builddir)/share/$(package)/tex && \
                ln -s $(abs-srcdir)/tex source && \
-               ln -s ../../../mf/$(outconfbase) generate
-       cd $(builddir)/share/lilypond/fonts && \
+               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 ../../../mf/$(outconfbase) afm && \
+               ln -s ../../../mf/$(outconfbase) otf && \
                ln -s ../../../mf/$(outconfbase) tfm && \
+               ln -s ../../../mf/$(outconfbase) svg && \
                ln -s ../../../mf/$(outconfbase) type1
-       cd $(builddir)/share/lilypond/elisp && \
-               ln -sf ../../../elisp/$(outconfbase)/lilypond.words.el . && \
+       cd $(builddir)/share/$(package)/elisp && \
+               ln -sf ../../../elisp/$(outconfbase)/lilypond-words.el . && \
                ln -s $(abs-srcdir)/elisp/*.el .
        $(foreach i,$(CATALOGS), \
                mkdir -p $(builddir)/share/locale/$i/LC_MESSAGES && \