Change lilypond-book includes

Including any ly file from input/new or input/lsr in manuals is now
possible.

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 8224a136631ac328dc59fd2c4e7716c7d099b5f0..649635328ec69295f8d4e66ea4906c72920febd4 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -163,7 +163,7 @@ page.
 fractions. This allows some forms of microtonal music.  For example,
 Turkish makam music uses 1/9th tone alterations.
 
-@lilypondfile{makam.ly}
+@lilypondfile{pitches/makam.ly}
 
 
 

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 0de62b93a1fb6eea494eb7021df483826ac7468c..2aba41db06077dfaa367772f16c2cb053eecf0fc 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -24,8 +24,7 @@ MUSICXML2LY = $(script-dir)/musicxml2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 
-## ugh : fix me, input/new/pitches
-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)/new/pitches
+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)/new/ -I $(input-dir)/lsr/
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2