support EXTERNAL_LILYPOND_BINARY variable.

diff --git a/ChangeLog b/ChangeLog
index 80c87a788c00c3f3f69a2217dd6e14a674d3f08b..ec60a015f8ae5a2af718aa0dc08425b778723343 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * make/lilypond-vars.make: support EXTERNAL_LILYPOND_BINARY variable.
+
        * mf/GNUmakefile: remove broken dvips map symlink.
 
 2006-01-04  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 56d9d6ffb79d41cdc548f5a126be12858352a522..f8d214903ed447742bc67ba4c668ab7189d0ce86 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,11 +1,15 @@
 ##
 ## settings to run LilyPond
-
+ifeq($(EXTERNAL_LILYPOND_BINARY,)
 # environment settings.
 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 PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
 export DVIPSHEADERS:=$(top-build-dir)/mf/out::
+else
+export PATH:=$(dir $(EXTERNAL_LILYPOND_BINARY)):$(PATH)
+endif
+
+export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
 
 the-script-dir=$(wildcard $(script-dir))
 
@@ -21,3 +25,4 @@ LILYPOND_BOOK_FLAGS = --process="$(LILYPOND) --backend=eps --formats=ps,png --he
 LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)
 LY2DVI = $(LILYPOND)
 LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py
+