X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=make%2Flilypond-vars.make;h=d1c7cd2fea46e8c9d86945286e91d339a645f0c1;hb=589cd505f81fd939a6def814ef3af70f005a23f7;hp=2736eb5069cb65c2441bd5775af114c162984d5c;hpb=c9d3519a9000da2ee8a5bc8a0afbd7f582b7c9a4;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 2736eb5069..d1c7cd2fea 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
 
@@ -27,9 +27,12 @@ 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)/lsr/ -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 \
+ -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
@@ -50,7 +53,12 @@ $(LANG_TEXIDOC_FLAGS) \
 -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)
 
@@ -72,5 +80,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