Build: website should rely on $LILYPOND_GIT

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

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index c01e27cb2ffed2daebf06dab6d68571726b37b0f..57cddb16ee37c75cd6cf850deed8cf1430e3d4cb 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -22,15 +22,16 @@ 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 $(input-dir)/manual/ \
- -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/      \
- -I $(top-build-dir)/mf/out/ -I $(top-src-dir)/input/manual \
+ -I $(input-dir)/regression/ -I $(top-src-dir)/Documentation/included/ \
+ -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)
 
@@ -54,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