continued proofreading.

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

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 516f519719e86875aa285eb3e97053bf530db47b..b02bb9ff16354c908c326e22ddf3fd411ab9f22c 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -8,7 +8,7 @@ export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfb
 # PREFIX incorrect.
 export LILYPONDPREFIX:=$(build_lilypond_datadir)
 
-export PYTHONPATH:=$(topdir)/python:$(PYTHONPATH)
+export PYTHONPATH:=$(builddir)/python/$(outdir):$(PYTHONPATH)
 
 ## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this
 export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)}
@@ -16,8 +16,6 @@ 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
@@ -39,17 +37,23 @@ ifneq ($(the-script-dir),)
 ### some versions apparently choke on $(message)
 ### $(message running from source tree stepmake)
 
+
+
+### Some versions of What? --hwn 
+
 ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
 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 $(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)/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
 
 else
+
 ### some versions apparently choke on $(message)
 ### $(message running from installed stepmake)
 
@@ -58,10 +62,9 @@ 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)
+LILYPOND_BOOK_FORMAT = texi
 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