X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=e67a570c92706d79e0913034b599577ef3e656ce;hb=9675132431ef8b44d24e8c03f1a846c9620ac5da;hp=993d6de0f67353fd4871aea82725828741ddfb8d;hpb=38a32411fecdac3d15b12fe912f38c698a42ee66;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 993d6de0f6..e67a570c92 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -22,17 +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 $(top-src-dir)/Documentation -I $(top-src-dir)/Documentation/snippets \
- -I $(input-dir)/regression/ -I $(top-src-dir)/Documentation/included/ \
- -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/	\
- -I $(top-build-dir)/mf/out/ \
- -I $(top-src-dir)/Documentation/pictures \
- -I $(top-build-dir)/Documentation/pictures/$(outdir)
+LILYPOND_BOOK_INCLUDES = -I $(src-dir) $(DOCUMENTATION_INCLUDES)
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2
@@ -54,13 +49,13 @@ $(LANG_TEXIDOC_FLAGS) \
 -danti-alias-factor=$(ANTI_ALIAS_FACTOR)
 
 ifdef QUIET_BUILD
-LILYPOND_BOOK_VERBOSE =
+LILYPOND_BOOK_WARN = --loglevel=NONE
 else
-LILYPOND_BOOK_VERBOSE = --verbose
+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
@@ -74,6 +69,8 @@ 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