X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=138c1f03ab4175172e7ea555aaee8fe80a9c595e;hb=a61bd357aa25a0bec314736a881550830706d5ae;hp=28a312bbd22b0996b80ade6b28cbce6f256fa988;hpb=2bd970c780ace4bf5ba0ce8f1ae572d08bdc8c19;p=lilypond.git diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 28a312bbd2..138c1f03ab 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -10,6 +10,8 @@ export LILYPONDPREFIX:=$(build_lilypond_datadir) export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH) +export GUILE_LOAD_PATH:=$(builddir):$(GUILE_LOAD_PATH) + ## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)} @@ -28,8 +30,6 @@ export DVIPSMAKEPK := mktexpk --destdir $(topdir)/mf/out endif -# guile load path? - the-script-dir=$(wildcard $(script-dir)) @@ -38,7 +38,7 @@ 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 -f tex --tex --header=texidoc -I $(srcdir)/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'" +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)'" #texi-html for www only: LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)