X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=c01e27cb2ffed2daebf06dab6d68571726b37b0f;hb=d8a0cd4ba54a7a1911364919d195b31bebcb3935;hp=10b82d8d9fd78c8af991d68ae7b4c59f48bf6586;hpb=38925347b5370c7eb06f7baaeac8a461a0a12ac4;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 10b82d8d9f..c01e27cb2f 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 $(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 $(top-build-dir)/mf/out/ -I $(top-src-dir)/input/manual \
+ -I $(top-src-dir)/Documentation/pictures \
+ -I $(top-build-dir)/Documentation/pictures/$(outdir)
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2
@@ -77,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