X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=0b8613180dd30f8f369bcb343eab5bd151cb2cf2;hb=10ad522f658c25f926e49074a5367c461c80d8ad;hp=83f330c9fd583c1c342b851ad334f625b3256a54;hpb=79d916d1fa2a921732f7432e87b25058693be370;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 83f330c9fd..0b8613180d 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,44 +1,45 @@
+##
+## 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 TFMFONTS=$(topdir)/mf/out:
+export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(PATH)
+
+# LilyPond is often run from within $(outdir), making a relative
+# PREFIX incorrect.
+export LILYPONDPREFIX:=$(build_lilypond_datadir)
+
+export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(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
 
-export LILYPONDPREFIX:=$(depth)/
-export PYTHONPATH:=$(buildscript-dir)/$(outdir):$(PYTHONPATH)
 
 # guile load path?
 
 the-script-dir=$(wildcard $(script-dir))
 
-ifneq ($(the-script-dir),)
-
-### some versions apparently choke on $(message)
-### $(message running from source tree stepmake)
 
 ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
-LILYPOND = $(depth)/$(builddir)/lily/$(outconfbase)/lilypond
+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/ -I $(input-dir)/tutorial/
-LY2DVI = $(script-dir)/ly2dvi.py
-PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh
-PS_TO_PNGS = $(buildscript-dir)/ps-to-pngs.sh
-
-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)
-LY2DVI = $(shell $(SHELL) -c 'type -p ly2dvi')
-PS_TO_GIFS = $(shell $(SHELL) -c 'type -p ps-to-gifs')
-PS_TO_PNGS = $(shell $(SHELL) -c 'type -p ps-to-pngs')
-
-endif
+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)/lilypond.py
+LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py