patch::: 1.3.137.jcn3

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

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 7fb3e57e33808017001d72221c5e20f6c06c0646..5f94a465bd8e4201c6b5e4c16bd3715e9399e08d 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,6 +1,42 @@
 
 export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
-export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(MFINPUTS)$(PATHSEP)$(PATHSEP)
-export TEXINPUTS:=$(topdir)/tex/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)$(PATHSEP)
-export LILYINCLUDE:=$(topdir)/scm$(PATHSEP)$(topdir)/init$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(LILYINCLUDE)
+
+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 LILYPONDPREFIX:=$(depth)/
+
+
+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_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