From: Phil Holmes Date: Sun, 26 Feb 2012 21:24:04 +0000 (+0000) Subject: Further lilypond output redirection X-Git-Tag: release/2.15.33-1~1^2^2~14 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=108fa8ef31c1f0dfbe9b95241d335709d3b16a64;p=lilypond.git Further lilypond output redirection Straightforward, so pushing to staging. --- diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make index fdf025bf6c..bb1fc23dfe 100644 --- 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 418d1b9f03..fbe81c281a 100644 --- 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