From 74c23ea22981a5cb38bcce50bd87c8dc3e642fc0 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 5 Jan 2006 19:41:29 +0000 Subject: [PATCH] * Documentation/user/GNUmakefile ($(outdir)/interfaces.itexi): remove absolute path to lilypond binary. * make/lilypond-vars.make: support LILYPOND_EXTERNAL_BINARY variable. --- ChangeLog | 5 ++++- Documentation/user/GNUmakefile | 4 ++-- make/lilypond-vars.make | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec60a015f8..b8e50c81ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2006-01-05 Han-Wen Nienhuys - * 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 f88316a0ad..cf8cf0703a 100644 --- 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 f8d214903e..3fe88a4228 100644 --- 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) -- 2.39.2