* make/lilypond-vars.make: centralize LILYPOND_BOOK_FLAGS setting.

[lilypond.git] / make / lilypond-vars.make

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index b02bb9ff16354c908c326e22ddf3fd411ab9f22c..e78d33c23b458aa9e0278dbcfe508fcb531f5ed2 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -8,7 +8,7 @@ export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfb
 # PREFIX incorrect.
 export LILYPONDPREFIX:=$(build_lilypond_datadir)
 
-export PYTHONPATH:=$(builddir)/python/$(outdir):$(PYTHONPATH)
+export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
 
 ## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this
 export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)}
@@ -32,39 +32,15 @@ endif
 
 the-script-dir=$(wildcard $(script-dir))
 
-ifneq ($(the-script-dir),)
-
-### some versions apparently choke on $(message)
-### $(message running from source tree stepmake)
-
-
-
-### Some versions of What? --hwn 
 
 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 $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/  -I $(builddir)/mf/out/
+LILYPOND_BOOK_FLAGS = --process="lilypond-bin -f tex --header=texidoc -I $(srcdir)/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'"
 
 #texi-html for www only:
 LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)
-LY2DVI = $(script-dir)/ly2dvi.py
+LY2DVI = $(LILYPOND)
 LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py
-
-else
-
-### some versions apparently choke on $(message)
-### $(message running from installed stepmake)
-
-ABC2LY = $(shell $(SHELL) -c 'type -p abc2ly')
-CONVERT_LY = $(shell $(SHELL) -c 'type -p convert-ly')
-LILYPOND = $(shell $(SHELL) -c 'type -p lilypond')
-LILYPOND_BOOK = $(shell $(SHELL) -c 'type -p lilypond-book')
-LILYPOND_BOOK_INCLUDES = -I. -I.. -I$(outdir)
-LILYPOND_BOOK_FORMAT = texi
-LY2DVI = $(shell $(SHELL) -c 'type -p ly2dvi')
-LYS_TO_TELY = $(shell $(SHELL) -c 'type -p lys-to-tely')
-
-endif
-