* lily/stem.cc (get_default_stem_end_position): use beam_count - 1

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 7a24b325a45600a560c9cf32e4bbdc91e57d4399..302b8721315c06715341c60d71f45dcd26c129b0 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -10,7 +10,7 @@ depth = .
 # 
 SUBDIRS = buildscripts scripts flower lily \
        mf ly tex ps scm \
-       python po make intl \
+       python po make \
        cygwin debian $(builddir)/stepmake \
        Documentation input
 #
@@ -21,7 +21,7 @@ README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
 IN_FILES := $(wildcard *.in)
 EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh 
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
-INSTALLATION_DIR=$(datadir)
+INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(configuration) VERSION
 
 # bootstrap stepmake:
@@ -60,12 +60,19 @@ my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp
 
 
 local-install:
-       $(INSTALL) -d $(datadir)
+       $(INSTALL) -d $(local_lilypond_datadir)
 ifeq ($(KPATHSEA),0)
-       $(foreach i, 1 2 3 4 5, rm -f $(datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(datadir)/tfm.$(i) ; )
+       $(foreach i, 1 2 3 4 5, rm -f $(local_lilypond_datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(local_lilypond_datadir)/tfm.$(i) ; )
 endif
 
 
+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 
+
 TOP_HTMLS = index.html examples.html
 
 examples: web-reqs
@@ -110,12 +117,12 @@ top-WWW-clean:
 
 WWW:
 
-default: builddir-setup
+default: $(config_h) builddir-setup
 
 builddir-setup: $(builddir)/share/lilypond-force
 
 $(builddir)/share/lilypond-force:
-       # Preparing LilyPond tree for builddir exec
+# Preparing LilyPond tree for builddir exec
        @echo Making $(builddir)/share 
        @cd $(builddir) && rm -rf share
        @mkdir -p $(builddir)/share/lilypond
@@ -141,3 +148,16 @@ $(builddir)/share/lilypond-force:
 local-clean: builddir-setup-clean
 builddir-setup-clean:
        @cd $(builddir) && rm -rf share
+
+$(config_h): configure.in aclocal.m4
+#
+# this is to prevent people from getting
+# undefined symbols  when we add them to config.h.in,
+# and they blindly run "cvs update; make".
+#
+       @echo
+       @echo ' *** config.h is out of date'
+       @echo ' *** Remove it and rerun autogen:'
+       @echo '         rm config.h; ./autogen.sh'
+       @echo
+       @false