X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-book-vars.make;h=8d9955b6a469262b858c46202874884d8aaba34d;hb=HEAD;hp=3627b5005497d92fc55795c68bd7968707f524a6;hpb=d7c0f4263534307616c82d9b2ce6fdef9472456f;p=lilypond.git

diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make
index 3627b50054..8d9955b6a4 100644
--- a/make/lilypond-book-vars.make
+++ b/make/lilypond-book-vars.make
@@ -1,10 +1,11 @@
 # rules for directories with html files.
 
 LILYPOND_BOOK_COMMAND = LILYPOND_VERSION=$(TOPLEVEL_VERSION) \
+	PDFTEX=$(PDFTEX) PDFLATEX=$(PDFLATEX) \
 	$(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 +19,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}
@@ -39,6 +40,11 @@ OUT_DOCBOOK_FILES = ${DOCBOOK_FILES:%.lyxml=$(outdir)/%.pdf}
 else
 OUT_DOCBOOK_FILES = ${DOCBOOK_FILES:%.lyxml=$(outdir)/%.xml}
 endif
+ifeq ($(PDFLATEX),xelatex)
+DBLATEX_BACKEND = -b xetex
+else
+DBLATEX_BACKEND =
+endif
 
 OUT_FILES = $(sort $(OUT_HTML_FILES) \
                             $(OUT_HTMLY_FILES) \