Imported Upstream version 2.16.0

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

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index cf1bc11203487102b4c3bb39d569aae1445a81fc..5c5e1efe3e0a171d74607787988e0a3e289c96b1 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -28,7 +28,7 @@ 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 $(top-src-dir)/Documentation -I $(top-build-dir)/Documentation/snippets/out \
  -I $(input-dir)/regression/ -I $(top-src-dir)/Documentation/included/ \
  -I $(top-build-dir)/mf/$(outconfbase)/        \
  -I $(top-build-dir)/mf/out/ \
@@ -55,13 +55,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
@@ -75,6 +75,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