release commit

[lilypond.git] / make / lilypond-vars.make

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index d9946a8914baddab69e0d54e884da51ed60516e1..0e83fc4cdcac61c9914cd479fffbb259fba6dce8 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,33 +1,13 @@
 ##
 ## settings to run LilyPond
 
-
+# environment settings.
 export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(builddir)/scripts/$(outconfbase):$(PATH):
-
-# LilyPond is often run from within $(outdir), making a relative
-# PREFIX incorrect.
 export LILYPONDPREFIX:=$(build_lilypond_datadir)/$(TOPLEVEL_VERSION)
-
 export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
+export DVIPSHEADERS:=$(builddir)/mf/out::
 
-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)}
 
-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
 
 
 the-script-dir=$(wildcard $(script-dir))
@@ -40,6 +20,7 @@ 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 --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)
 LY2DVI = $(LILYPOND)