Doc build looks for files in input/manual/ instead of input/test/

diff --git a/Documentation/user/SConscript b/Documentation/user/SConscript
index 5d653a01f8e5a4a5244b5e5568c1b4e4029888b1..44570d30d4f928c707bbce98a170acecc93160df 100644 (file)
--- a/Documentation/user/SConscript
+++ b/Documentation/user/SConscript
@@ -16,9 +16,9 @@ env.Depends ('lilypond.texi', 'lilypond-internals.texi')
 eps = src_glob ('*.eps') + map (env.PNG2EPS, base_glob ('*.png'))
 env.Depends ('lilypond.texi', eps + png)
 
-lilypond_book_flags = '''--format=$LILYPOND_BOOK_FORMAT --process="lilypond -I$srcdir/input/test $__verbose --backend=eps --formats=ps,png --header=texidoc -dinternal-type-checking -ddump-signatures -danti-alias-factor=2 -dgs-font-load" '''
+lilypond_book_flags = '''--format=$LILYPOND_BOOK_FORMAT --process="lilypond -I$srcdir/input/manual/ $__verbose --backend=eps --formats=ps,png --header=texidoc -dinternal-type-checking -ddump-signatures -danti-alias-factor=2 -dgs-font-load" '''
 e = env.Copy (
-#      LILYPOND_BOOK_FLAGS = '''--process="lilypond --backend=eps --formats=ps,png --header=texidoc -I#/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'"''',
+#      LILYPOND_BOOK_FLAGS = '''--process="lilypond --backend=eps --formats=ps,png --header=texidoc -I#/input/manual -e '(ly:set-option (quote internal-type-checking) \#t)'"''',
        LILYPOND_BOOK_FLAGS = lilypond_book_flags,
        __verbose = ' --verbose',
        GENERATE_DOCUMENTATION = '$srcdir/ly/generate-documentation',

diff --git a/input/GNUmakefile b/input/GNUmakefile
index 8fa23d82758bc4cea0da298f151f283264aec79f..da9987de40f7cf6afb0559cae600c71425601bca 100644 (file)
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-SUBDIRS = test regression tutorial no-notation mutopia
+SUBDIRS = test regression tutorial no-notation mutopia manual
 
 examples = typography-demo les-nereides wilhelmus proportional bach-schenker
 

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 1dd53512b89e31d624b98b4fb1fdf4290da82911..67ff5fca9aa120445fb60530236b3c81edf3d0a2 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -23,9 +23,9 @@ the-script-dir=$(wildcard $(script-dir))
 ABC2LY = $(script-dir)/abc2ly.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)/test/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/  -I $(top-build-dir)/mf/out/
+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/
 LILYPOND_BOOK_LILYPOND_FLAGS=-dgs-font-load
-LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) --backend=eps --formats=ps,png --header=texidoc -I $(top-src-dir)/input/test -dinternal-type-checking -ddump-signatures -danti-alias-factor=2 $(LILYPOND_BOOK_LILYPOND_FLAGS)"
+LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) --backend=eps --formats=ps,png --header=texidoc -I $(top-src-dir)/input/manual -dinternal-type-checking -ddump-signatures -danti-alias-factor=2 $(LILYPOND_BOOK_LILYPOND_FLAGS)"
 TEXINPUTS=$(top-src-dir)/tex/::
 export TEXINPUTS