X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=1dd53512b89e31d624b98b4fb1fdf4290da82911;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=3c55dbeedc54cfbf82094ebe4702b37f7ffcdca7;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 3c55dbeedc..1dd53512b8 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,10 +1,11 @@
 ##
 ## 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 LILYPOND_BINARY=$(top-build-dir)/$(outconfbase)/bin/lilypond
+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
@@ -22,11 +23,9 @@ the-script-dir=$(wildcard $(script-dir))
 ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
-LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/manual/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/  -I $(top-build-dir)/mf/out/
-
-LILYPOND_BOOK_LILYPOND_FLAGS=--backend=eps --formats=ps,png,pdf -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -dcheck-internal-types -ddump-signatures -danti-alias-factor=2
-
-LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) $(LILYPOND_BOOK_LILYPOND_FLAGS)"
+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