* make/lilypond-vars.make: set LILYPOND_BINARY variable

(LILYPOND_BOOK_LILYPOND_FLAGS): new variable
LILYPOND_BOOK_LILYPOND_FLAGS to hold system dependent settings,
like -dgs-font-load.

* Documentation/user/GNUmakefile ($(outdir)/interfaces.itexi):
remove absolute path to lilypond binary.

diff --git a/ChangeLog b/ChangeLog
index 84b22f08f338a8f974ae5bf6d1a9be7af8156263..6889690a252700ca5012bbf0491f381f0e3451bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,19 @@
-2006-01-05    <kroeger@pedrokroeger.net>
-
-       * configure.in (NCSB_DIR): fix --with-ncsb-dir option.
 
 2006-01-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * make/lilypond-vars.make: set LILYPOND_BINARY variable
+       (LILYPOND_BOOK_LILYPOND_FLAGS): new variable
+       LILYPOND_BOOK_LILYPOND_FLAGS to hold system dependent settings,
+       like -dgs-font-load.
+
        * Documentation/user/GNUmakefile ($(outdir)/interfaces.itexi):
        remove absolute path to lilypond binary.
+       
+2006-01-05 Pedro Kroeger    <kroeger@pedrokroeger.net>
+
+       * configure.in (NCSB_DIR): fix --with-ncsb-dir option.
+
+2006-01-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * make/lilypond-vars.make: support LILYPOND_EXTERNAL_BINARY variable.
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index cf8cf0703a7c4772f0736d48099f6e5ddcd56a58..ca93cec69bccbc6853f1366245ddd9c1b666dfd4 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -258,8 +258,8 @@ ifneq ($(CROSS),yes)
 # of lilypond-internals every time.  however, this triggers
 # compilation during install, which is a bad thing (tm).
 
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(top-build-dir)/lily/$(outconfbase)/lilypond
-       cd $(outdir) && lilypond --verbose $(top-src-dir)/ly/generate-documentation
+$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(LILYPOND_BINARY)
+       cd $(outdir) && $(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation
        rm -f $(outdir)/lilypond-internals.nexi
        -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 3fe88a4228f3db54a5ca2711cfb083f71fa1bdb1..c9b67de1ec2b815619064c174bd3c9326c90d985 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -5,8 +5,10 @@ ifeq ($(LILYPOND_EXTERNAL_BINARY),)
 export PATH:=$(top-build-dir)/lily/$(outconfbase):$(top-build-dir)/buildscripts/$(outconfbase):$(top-build-dir)/scripts/$(outconfbase):$(PATH):
 export LILYPONDPREFIX:=$(build_lilypond_datadir)/$(TOPLEVEL_VERSION)
 export DVIPSHEADERS:=$(top-build-dir)/mf/out::
+export LILYPOND_BINARY=$(top-build-dir)/lily/$(outconfbase)/lilypond
 else
 export PATH:=$(dir $(LILYPOND_EXTERNAL_BINARY)):$(PATH)
+export LILYPOND_BINARY=$(LILYPOND_EXTERNAL_BINARY)
 endif
 
 export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
@@ -15,10 +17,10 @@ the-script-dir=$(wildcard $(script-dir))
 
 ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
-LILYPOND = $(top-build-dir)/lily/$(outconfbase)/lilypond
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I$(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/  -I $(top-build-dir)/mf/out/
-LILYPOND_BOOK_FLAGS = --process="$(LILYPOND) --backend=eps --formats=ps,png --header=texidoc -I $(top-src-dir)/input/test -dinternal-type-checking -danti-alias-factor=2 -dgs-font-load"
+LILYPOND_BOOK_LILYPOND_FLAGS=-dgs-font-load
+LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) --verbose --backend=eps --formats=ps,png --header=texidoc -I $(top-src-dir)/input/test -dinternal-type-checking -danti-alias-factor=2 $(LILYPOND_BOOK_LILYPOND_FLAGS)"
 
 
 #texi-html for www only: