Imported Upstream version 2.16.0

[lilypond.git] / make / lilypond-book-vars.make

diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make
index 3627b5005497d92fc55795c68bd7968707f524a6..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)
@@ -18,10 +18,10 @@ TELY_FILES = $(call src-wildcard,*.tely)
 DOCBOOK_FILES = $(call src-wildcard,*.lyxml)
 
 OUT_HTML_FILES = ${HTML_FILES:%.html=$(outdir)/%.html}
-OUT_HTMLY_FILES = ${HTML_FILES:%.htmly=$(outdir)/%.html}
+OUT_HTMLY_FILES = ${HTMLY_FILES:%.htmly=$(outdir)/%.html}
 OUT_XML_FILES = ${XML_FILES:%.xml=$(outdir)/%.html}
 # If we have pdflatex, create the pdf, otherwise only the .tex file!
-ifeq (,$(findstring dblatex,$(MISSING_OPTIONAL)))
+ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL)))
 OUT_LYTEX_FILES = ${LYTEX_FILES:%.lytex=$(outdir)/%.pdf}
 OUT_LATEX_FILES = ${LATEX_FILES:%.latex=$(outdir)/%.pdf}
 OUT_TEX_FILES = ${TEX_FILES:%.tex=$(outdir)/%.pdf}