X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=1dd53512b89e31d624b98b4fb1fdf4290da82911;hb=a1f9151b33a594a29598d521894bb9000d97c7a1;hp=c967da8063949c8daa2c30105943f0579fad03a0;hpb=f1ad3f60a5b123571dd50cf5bf7d06a4daeb5de6;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index c967da8063..1dd53512b8 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,45 +1,36 @@
 ##
 ## settings to run LilyPond
+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)/current
+export DVIPSHEADERS:=$(top-build-dir)/mf/out::
+export LILYPOND_BINARY=$(top-build-dir)/lily/$(outconfbase)/lilypond
+else
+
+## better not take the binaries  from a precompiled bundle, as they
+## rely on env vars for relocation.
+##
 
-
-export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(PATH)
-
-# LilyPond is often run from within $(outdir), making a relative
-# PREFIX incorrect.
-export LILYPONDPREFIX:=$(build_lilypond_datadir)/lilypond
-
-export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
-
-## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this
-export TEXMF:={$(build_lilypond_datadir),$(shell kpsexpand \$$TEXMF)}
-
-export MFINPUTS:=
-export TEXINPUTS:=
-export TFMFONTS:=
-export extra_mem_top=1000000
-export extra_mem_bottom=1000000
-export pool_size=500000
-
-
-ifdef DEB_BUILD
-export PKFONTS := $(topdir)/mf/out
-export MT_DESTROOT := $(topdir)/mf/out
-export DVIPSMAKEPK := mktexpk --destdir $(topdir)/mf/out
+#export PATH:=$(dir $(LILYPOND_EXTERNAL_BINARY)):$(PATH)
+export LILYPOND_BINARY=$(LILYPOND_EXTERNAL_BINARY)
 endif
 
-
-# guile load path?
+export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
 
 the-script-dir=$(wildcard $(script-dir))
 
-
 ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
-LILYPOND = $(builddir)/lily/$(outconfbase)/lilypond
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
-LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/  -I $(builddir)/mf/out/
+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_LILYPOND_FLAGS=-dgs-font-load
+LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) --backend=eps --formats=ps,png --header=texidoc -I $(top-src-dir)/input/test -dinternal-type-checking -ddump-signatures -danti-alias-factor=2 $(LILYPOND_BOOK_LILYPOND_FLAGS)"
+TEXINPUTS=$(top-src-dir)/tex/::
+export TEXINPUTS
 
 #texi-html for www only:
 LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)
-LY2DVI = $(script-dir)/lilypond.py
+LY2DVI = $(LILYPOND_BINARY)
 LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py
+