X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=13aad7f6e4b2a8c5f4e9b9b090aa7e8fca1add5d;hb=c37888fe2f06304914ae980b26cb82de2b1deccf;hp=631b5dbd9a374bd5f0c587a3086422a3cdf294fc;hpb=432ff5225833fb6c385aa95acd0c55c0594708f8;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 631b5dbd9a..13aad7f6e4 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,67 +1,27 @@
 ##
 ## settings to run LilyPond
 
+# environment settings.
+export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(builddir)/scripts/$(outconfbase):$(PATH):
+export LILYPONDPREFIX:=$(build_lilypond_datadir)/$(TOPLEVEL_VERSION)
+export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
+export DVIPSHEADERS:=$(builddir)/mf/out::
 
-export PATH:=$(abs-builddir)/lily/$(outconfbase):$(abs-builddir)/buildscripts/$(outconfbase):$(PATH)
 
-# LilyPond is often run from within $(outdir), making a relative
-# PREFIX incorrect.
-export LILYPONDPREFIX:=$(shell cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION); pwd)
 
-export PYTHONPATH:=$(topdir)/python:$(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=250000
-
-
-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))
 
-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 = $(abs-builddir)/lily/$(outconfbase)/lilypond
+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)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(abs-builddir)/mf/$(outconfbase)/  -I $(abs-builddir)/mf/out/
-LY2DVI = $(script-dir)/ly2dvi.py
-LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py
-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)/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)'"
 
-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')
-LYS_TO_TELY = $(shell $(SHELL) -c 'type -p lys-to-tely')
-PS_TO_GIFS = $(shell $(SHELL) -c 'type -p ps-to-gifs')
-PS_TO_PNGS = $(shell $(SHELL) -c 'type -p ps-to-pngs')
-
-endif
 
+#texi-html for www only:
+LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)
+LY2DVI = $(LILYPOND)
+LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py