X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=b02bb9ff16354c908c326e22ddf3fd411ab9f22c;hb=fabf53486884f78f54855a7b4a59cb105d83f638;hp=94531eb69375c1ddbb7c501910f4bb8a889842ee;hpb=a6157e173876ce2a638649ba8c240f02ed905888;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 94531eb693..b02bb9ff16 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,12 +1,34 @@
+##
+## settings to run LilyPond
 
-export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
 
-export MFINPUTS:=$(topdir)/mf/:$(MFINPUTS)::
-export TEXINPUTS:=$(topdir)/mf/out/:$(topdir)/tex/:$(topdir)/ps/:$(TEXINPUTS):$(pwd)::
-export LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(TEX_TFMDIR):$(LILYINCLUDE)
+export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(PATH)
 
-export LILYPONDPREFIX:=$(depth)/
+# LilyPond is often run from within $(outdir), making a relative
+# PREFIX incorrect.
+export LILYPONDPREFIX:=$(build_lilypond_datadir)
 
+export PYTHONPATH:=$(builddir)/python/$(outdir):$(PYTHONPATH)
+
+## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this
+export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)}
+
+export MFINPUTS:=
+export TEXINPUTS:=
+export TFMFONTS:=
+export extra_mem_top=1000000
+export extra_mem_bottom=1000000
+export pool_size=500000
+
+
+ifdef DEB_BUILD
+export PKFONTS := $(topdir)/mf/out
+export MT_DESTROOT := $(topdir)/mf/out
+export DVIPSMAKEPK := mktexpk --destdir $(topdir)/mf/out
+endif
+
+
+# guile load path?
 
 the-script-dir=$(wildcard $(script-dir))
 
@@ -15,25 +37,34 @@ 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
-LY2DVI = $(script-dir)/ly2dvi.py
+LILYPOND = $(builddir)/lily/$(outconfbase)/lilypond
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
-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
+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/
+
+#texi-html for www only:
+LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)
+LY2DVI = $(script-dir)/ly2dvi.py
+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')
-LY2DVI = $(shell $(SHELL) -c 'type -p ly2dvi')
 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)
-PS_TO_GIFS = $(shell $(SHELL) -c 'type -p ps-to-gifs')
-PS_TO_PNGS = $(shell $(SHELL) -c 'type -p ps-to-pngs')
+LILYPOND_BOOK_FORMAT = texi
+LY2DVI = $(shell $(SHELL) -c 'type -p ly2dvi')
+LYS_TO_TELY = $(shell $(SHELL) -c 'type -p lys-to-tely')
 
 endif