Further lilypond output redirection

Straightforward, so pushing to staging.

diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make
index fdf025bf6cf585acab99ca8133316fe443f04a63..bb1fc23dfe23d42f9b588cba90eab2e175203373 100644 (file)
--- a/make/lilypond-book-vars.make
+++ b/make/lilypond-book-vars.make
@@ -4,7 +4,7 @@ LILYPOND_BOOK_COMMAND = LILYPOND_VERSION=$(TOPLEVEL_VERSION) \
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) \
        --process='$(LILYPOND_BOOK_PROCESS) \
        $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) \
-       $(LILYPOND_BOOK_FLAGS)
+        --redirect-lilypond-output $(LILYPOND_BOOK_FLAGS)
 
 HTML_FILES = $(call src-wildcard,*.html)
 HTMLY_FILES = $(call src-wildcard,*.htmly)

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 418d1b9f03ac6cb47c03289acb71c82c260b8b82..fbe81c281abe61c7c4de0a3caa5ecba3badb5847 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -5,7 +5,7 @@ LYS_OUTPUT_OPTION= --lily-output-dir $(LYS_OUTPUT_DIR)
 LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-db
 LILYPOND_BOOK_FLAGS += $(LYS_OUTPUT_OPTION)
 $(outdir)/%.latex: %.doc $(INIT_LY_SOURCES) $(SCHEME_SOURCES)
-       LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) $(LILYPOND_BOOK_FLAGS) $<
+       LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) $(LILYPOND_BOOK_FLAGS) --redirect-lilypond-output $<
 
 
 # This allows -j make option while making sure only one lilypond-book instance