X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=e67a570c92706d79e0913034b599577ef3e656ce;hb=aafcc4147ae2fea2ba1d95c7a54963c61f21b963;hp=f655cf6177ee9a43833ca485fa87220de8cd4ffb;hpb=14cb1905eaf37be1f8a5f5222b5c2433e0e80657;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index f655cf6177..e67a570c92 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -3,7 +3,7 @@
 ifeq ($(LILYPOND_EXTERNAL_BINARY),)
 
 # environment settings.
-export PATH:=$(top-build-dir)/lily/$(outconfbase):$(top-build-dir)/buildscripts/$(outconfbase):$(top-build-dir)/scripts/$(outconfbase):$(PATH):
+export PATH:=$(top-build-dir)/lily/$(outconfbase):$(buildscript-dir):$(top-build-dir)/scripts/$(outconfbase):$(PATH):
 export LILYPOND_BINARY=$(top-build-dir)/$(outconfbase)/bin/lilypond
 else
 
@@ -22,15 +22,12 @@ export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
 the-script-dir=$(wildcard $(script-dir))
 
 ABC2LY = $(script-dir)/abc2ly.py
+MIDI2LY = $(script-dir)/midi2ly.py
 MUSICXML2LY = $(script-dir)/musicxml2ly.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/ -I $(input-dir)/lsr/ -I			\
- $(top-src-dir)/input/manual 
+LILYPOND_BOOK_INCLUDES = -I $(src-dir) $(DOCUMENTATION_INCLUDES)
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2
@@ -51,9 +48,14 @@ $(LANG_TEXIDOC_FLAGS) \
 -ddump-signatures \
 -danti-alias-factor=$(ANTI_ALIAS_FACTOR)
 
-LILYPOND_BOOK_VERBOSE = --verbose
+ifdef QUIET_BUILD
+LILYPOND_BOOK_WARN = --loglevel=NONE
+else
+LILYPOND_BOOK_WARN = --loglevel=WARN
+endif
+
 LILYPOND_BOOK_INFO_IMAGES_DIR = $(if $(INFO_IMAGES_DIR),--info-images-dir=$(INFO_IMAGES_DIR),)
-LILYPOND_BOOK_FLAGS = $(LILYPOND_BOOK_VERBOSE) $(LILYPOND_BOOK_INFO_IMAGES_DIR)
+LILYPOND_BOOK_FLAGS = $(LILYPOND_BOOK_WARN) $(LILYPOND_BOOK_INFO_IMAGES_DIR)
 
 ifeq ($(out),)
 LILYPOND_BOOK_PROCESS = true
@@ -67,11 +69,13 @@ endif
 
 TEXINPUTS=$(top-src-dir)/tex/::
 export TEXINPUTS
+TEXFONTMAPS=$(top-build-dir)/tex/$(outdir)::
+export TEXFONTMAPS
 
 export LYDOC_LOCALEDIR:= $(top-build-dir)/Documentation/po/out-www
 
 #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
+LYS_TO_TELY = $(buildscript-dir)/lys-to-tely