X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=126d2c30d0b9f2c5d008f80e700ba3275a652357;hb=69f0ec479a6ade46d0a227755bb02562112c6743;hp=c26b1d4219a145d4d33d7c1bfd23d0d22d106dbe;hpb=f436cbf790e4a6100bf2b21e4fb2ff9f3dfcc3cf;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index c26b1d4219..126d2c30d0 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
 
@@ -26,7 +26,11 @@ 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 $(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 $(top-src-dir)/Documentation -I $(top-src-dir)/Documentation/snippets
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2
@@ -43,12 +47,16 @@ $(LILYPOND_JOBS) \
 $(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)
 
@@ -70,5 +78,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