* Documentation/user/basic-notation.itely (Basic polyphony): fix

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index e654362a75dd6ec4512a5fffce3e0ec803093267..e5f9f0cdf57cee69535bf51e3e08c530462815fc 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -18,8 +18,8 @@ SUBDIRS = buildscripts python scripts \
        vim 
 #
 
-include VERSION
-package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
+#include VERSION
+#package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
 
 SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile
 README_FILES = ChangeLog  COPYING DEDICATION ROADMAP THANKS HACKING
@@ -60,11 +60,7 @@ local-install:
        $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
 
 final-install:
-       @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.'
+       @true
 
 web-ext = html midi pdf png txt ly
 
@@ -102,7 +98,7 @@ PO_FILES = $(wildcard $(srcdir)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:$(srcdir)/po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
-$(tree-prefix)/lilypond-force: GNUmakefile
+$(tree-prefix)/lilypond-force link-tree: GNUmakefile
 # Preparing LilyPond tree for builddir exec
        cd $(builddir) && rm -rf lib share
        mkdir -p $(builddir)/lib/$(package)
@@ -132,16 +128,18 @@ $(tree-prefix)/lilypond-force: GNUmakefile
                ln -s $(abs-srcdir)/tex source && \
                ln -s ../../../../tex/$(outconfbase) tex-out && \
                ln -s ../../../../mf/$(outconfbase) mf-out
-       cd $(tree-prefix)/fonts/type1 && \
-               ln -s ../../../../../mf/$(outconfbase)/*.pfa .
+       cd $(tree-prefix)/fonts/enc && \
+               ln -s ../../../../../mf/$(outconfbase)/*.enc .
+       cd $(tree-prefix)/fonts/map && \
+               ln -s ../../../../../mf/$(outconfbase)/*.map .
        cd $(tree-prefix)/fonts/otf && \
                ln -s ../../../../../mf/$(outconfbase)/*.otf .
        cd $(tree-prefix)/fonts/svg && \
                ln -s ../../../../../mf/$(outconfbase)/*.svg .
        cd $(tree-prefix)/fonts/tfm && \
                ln -s ../../../../../mf/$(outconfbase)/*.tfm .
-       cd $(tree-prefix)/fonts/enc && \
-               ln -s ../../../../../mf/$(outconfbase)/*.enc .
+       cd $(tree-prefix)/fonts/type1 && \
+               ln -s ../../../../../mf/$(outconfbase)/*.pfa .
        cd $(tree-prefix)/fonts && \
                ln -s $(abs-srcdir)/mf source && \
                true
@@ -152,13 +150,14 @@ $(tree-prefix)/lilypond-force: GNUmakefile
                mkdir -p $(share-prefix)/locale/$i/LC_MESSAGES && \
                cd $(share-prefix)/locale/$i/LC_MESSAGES && \
                ln -sf ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true
-       touch $@
+#      touch $@
+       touch $(tree-prefix)/lilypond-force
 
 local-clean: builddir-setup-clean
 builddir-setup-clean:
        cd $(builddir) && rm -rf share
 
-$(config_h): config.hh.in 
+$(config_h): config.hh.in
 #
 # this is to prevent people from getting
 # undefined symbols  when we add them to config.h.in,