X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-book-vars.make;h=bb1fc23dfe23d42f9b588cba90eab2e175203373;hb=077030678f06511b3b64b5c072e767e0e94bcdb4;hp=910cadc1200f6c3ab663dd0faf3ae4ab0911253e;hpb=40ea8df890cff88f5fa02e1b690104740feeb3c3;p=lilypond.git diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make index 910cadc120..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) @@ -21,7 +21,7 @@ OUT_HTML_FILES = ${HTML_FILES:%.html=$(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}