-LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/
-PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh
-PS_TO_PNGS = $(buildscript-dir)/ps-to-pngs.sh
-
-else
-
-$(message running from installed stepmake)
-
-ABC2LY = $(shell $(SHELL) -c 'type -p abc2ly')
-LY2DVI = $(shell $(SHELL) -c 'type -p ly2dvi')
-CONVERT_LY = $(shell $(SHELL) -c 'type -p convert-ly')
-LILYPOND_BOOK = $(shell $(SHELL) -c 'type -p lilypond-book')
-LILYPOND_BOOK_INCLUDES = -I. -I.. -I$(outdir)
-PS_TO_GIFS = $(shell $(SHELL) -c 'type -p ps-to-gifs')
-PS_TO_PNGS = $(shell $(SHELL) -c 'type -p ps-to-pngs')
+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 --backend=eps --formats=ps,png --header=texidoc -I $(srcdir)/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'"