From 095dce494ede005e3d7b560bd4be008073e05ed9 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 5 Jan 2006 19:20:50 +0000 Subject: [PATCH] support EXTERNAL_LILYPOND_BINARY variable. --- ChangeLog | 2 ++ make/lilypond-vars.make | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80c87a788c..ec60a015f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-01-05 Han-Wen Nienhuys + * make/lilypond-vars.make: support EXTERNAL_LILYPOND_BINARY variable. + * mf/GNUmakefile: remove broken dvips map symlink. 2006-01-04 Jan Nieuwenhuizen diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 56d9d6ffb7..f8d214903e 100644 --- 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 + -- 2.39.2