* Documentation/user/GNUmakefile ($(outdir)/interfaces.itexi):

remove absolute path to lilypond binary.

* make/lilypond-vars.make: support LILYPOND_EXTERNAL_BINARY variable.

diff --git a/ChangeLog b/ChangeLog
index ec60a015f8ae5a2af718aa0dc08425b778723343..b8e50c81ea6a1f032259d4d88f9cf8e0f4d6b7aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2006-01-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
-       * make/lilypond-vars.make: support EXTERNAL_LILYPOND_BINARY variable.
+       * Documentation/user/GNUmakefile ($(outdir)/interfaces.itexi):
+       remove absolute path to lilypond binary.
+
+       * make/lilypond-vars.make: support LILYPOND_EXTERNAL_BINARY variable.
 
        * mf/GNUmakefile: remove broken dvips map symlink.
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index f88316a0ad2a984bca458a4e4b4e5842655e095d..cf8cf0703a7c4772f0736d48099f6e5ddcd56a58 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -259,14 +259,14 @@ ifneq ($(CROSS),yes)
 # 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) && $(top-build-dir)/lily/$(outconfbase)/lilypond --verbose $(top-src-dir)/ly/generate-documentation
+       cd $(outdir) && lilypond --verbose $(top-src-dir)/ly/generate-documentation
        rm -f $(outdir)/lilypond-internals.nexi
        -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 
 
 ## unused
 $(outdir)/interfaces.itexi: dummy
-       cd $(outdir) && $(top-build-dir)/lily/$(outconfbase)/lilypond $(top-src-dir)/ly/generate-interface-doc
+       cd $(outdir) && lilypond $(top-src-dir)/ly/generate-interface-doc
 
 else
 

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index f8d214903ed447742bc67ba4c668ab7189d0ce86..3fe88a4228f3db54a5ca2711cfb083f71fa1bdb1 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,12 +1,12 @@
 ##
 ## settings to run LilyPond
-ifeq($(EXTERNAL_LILYPOND_BINARY,)
+ifeq ($(LILYPOND_EXTERNAL_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 DVIPSHEADERS:=$(top-build-dir)/mf/out::
 else
-export PATH:=$(dir $(EXTERNAL_LILYPOND_BINARY)):$(PATH)
+export PATH:=$(dir $(LILYPOND_EXTERNAL_BINARY)):$(PATH)
 endif
 
 export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)