X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=c72c0cec4281e5303eb07a50f6218cb3bb83cd72;hb=f27a0658b549dc41903280c62388e76df87523f0;hp=b571b4c16042aad61decb877100261871a0bf990;hpb=4eeca0046602a7083480496eee2fe5c3e185bdc3;p=lilypond.git diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index b571b4c160..c72c0cec42 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -2,7 +2,7 @@ ## settings to run LilyPond -export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(PATH) +export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(builddir)/scripts/$(outconfbase):$(PATH): # LilyPond is often run from within $(outdir), making a relative # PREFIX incorrect. @@ -38,9 +38,9 @@ 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)/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)'" +LILYPOND_BOOK_FLAGS = --process="lilypond --backend ps --formats=ps,png --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)/lilypond.py +LY2DVI = $(LILYPOND) LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py