Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 5c53037cd5164e9ffe92721adbcba306488da53a..1e60313993a7872e6083194d1ac41d3e7616a265 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,6 +1,40 @@
+##
+## settings to run LilyPond
+ifeq ($(LILYPOND_EXTERNAL_BINARY),)
 
-export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
-export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(MFINPUTS)$(PATHSEP)$(PATHSEP)
-export TEXINPUTS:=$(topdir)/tex/$(PATHSEP)$(topdir)/ps/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)..$(PATHSEP)$(PATHSEP)
-export LILYINCLUDE:=$(topdir)/scm$(PATHSEP)$(topdir)/ly$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(PATHSEP)$(topdir)/tfm:$(LILYINCLUDE)
+# environment settings.
+export PATH:=$(top-build-dir)/lily/$(outconfbase):$(top-build-dir)/buildscripts/$(outconfbase):$(top-build-dir)/scripts/$(outconfbase):$(PATH):
+export LILYPOND_BINARY=$(top-build-dir)/$(outconfbase)/bin/lilypond
+else
+
+## better not take the binaries  from a precompiled bundle, as they
+## rely on env vars for relocation.
+##
+
+#export PATH:=$(dir $(LILYPOND_EXTERNAL_BINARY)):$(PATH)
+export LILYPOND_BINARY=$(LILYPOND_EXTERNAL_BINARY)
+endif
+
+export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
+
+the-script-dir=$(wildcard $(script-dir))
+
+ABC2LY = $(script-dir)/abc2ly.py
+CONVERT_LY = $(script-dir)/convert-ly.py
+LILYPOND_BOOK = $(script-dir)/lilypond-book.py
+LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/manual/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/  -I $(top-build-dir)/mf/out/
+
+## override from cmd line to speed up. 
+ANTI_ALIAS_FACTOR=2
+LILYPOND_JOBS=$(if $(CPU_COUNT),-djob-count=$(CPU_COUNT),)
+LILYPOND_BOOK_LILYPOND_FLAGS=--backend=eps --formats=ps,png,pdf $(LILYPOND_JOBS) -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -dcheck-internal-types -ddump-signatures -danti-alias-factor=$(ANTI_ALIAS_FACTOR)
+LILYPOND_BOOK_VERBOSE = --verbose
+LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) $(LILYPOND_BOOK_LILYPOND_FLAGS)"  $(LILYPOND_BOOK_VERBOSE)
+TEXINPUTS=$(top-src-dir)/tex/::
+export TEXINPUTS
+
+#texi-html for www only:
+LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)
+LY2DVI = $(LILYPOND_BINARY)
+LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py