X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=cf1bc11203487102b4c3bb39d569aae1445a81fc;hb=00b3375d91ee3b349418d65cdc5dc4947b3d8312;hp=07828e6a9fd9ac21e3af7ace6cdb4fc7d9863667;hpb=c6249e4a2fe98219ffd8a9f3f0083cfaf8677a46;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 07828e6a9f..cf1bc11203 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,30 +22,44 @@ 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/
+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 $(top-build-dir)/mf/$(outconfbase)/	\
+ -I $(top-build-dir)/mf/out/ \
+ -I $(top-src-dir)/Documentation/pictures \
+ -I $(top-build-dir)/Documentation/pictures/$(outdir)
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2
 LILYPOND_JOBS=$(if $(CPU_COUNT),-djob-count=$(CPU_COUNT),)
 LANG_TEXIDOC_FLAGS:=$(foreach lang,$(LANGS),--header=texidoc$(lang))
+LANG_DOCTITLE_FLAGS:=$(foreach lang,$(LANGS),--header=doctitle$(lang))
 
 LILYPOND_BOOK_LILYPOND_FLAGS=-dbackend=eps \
 --formats=ps,png,pdf \
 $(LILYPOND_JOBS) \
 -dinclude-eps-fonts \
 -dgs-load-fonts \
+--header=doctitle \
+$(LANG_DOCTITLE_FLAGS) \
 --header=texidoc \
 $(LANG_TEXIDOC_FLAGS) \
--I $(top-src-dir)/input/manual \
 -dcheck-internal-types \
 -ddump-signatures \
 -danti-alias-factor=$(ANTI_ALIAS_FACTOR)
 
+ifdef QUIET_BUILD
+LILYPOND_BOOK_VERBOSE =
+else
 LILYPOND_BOOK_VERBOSE = --verbose
+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)
 
@@ -67,5 +81,5 @@ 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