patch::: 1.4.2.jcn1

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

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 94531eb69375c1ddbb7c501910f4bb8a889842ee..1634bdbcf0388f00a6a45dbfc21df9ee92019374 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -4,9 +4,18 @@ 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:
+
+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))
 
@@ -17,9 +26,10 @@ ifneq ($(the-script-dir),)
 
 ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
-LY2DVI = $(script-dir)/ly2dvi.py
+LILYPOND = $(depth)/$(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/
+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/
+LY2DVI = $(script-dir)/ly2dvi.py
 PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh
 PS_TO_PNGS = $(buildscript-dir)/ps-to-pngs.sh
 
@@ -28,10 +38,11 @@ else
 ### $(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)
+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')