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

diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make
index 8b549e0646..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)
@@ -13,14 +14,15 @@ LYTEX_FILES = $(call src-wildcard,*.lytex)
 LATEX_FILES = $(call src-wildcard,*.latex)
 TEX_FILES = $(call src-wildcard,*.tex)
 TEXI_FILES = $(call src-wildcard,*.texi)
+TEXINFO_FILES = $(call src-wildcard,*.texinfo)
 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}
@@ -30,6 +32,7 @@ OUT_LATEX_FILES = ${LATEX_FILES:%.latex=$(outdir)/%.tex}
 OUT_TEX_FILES = ${TEX_FILES:%.tex=$(outdir)/%.tex}
 endif
 OUT_TEXI_FILES = ${TEXI_FILES:%.texi=$(outdir)/%.html}
+OUT_TEXINFO_FILES = ${TEXINFO_FILES:%.texinfo=$(outdir)/%.html}
 OUT_TELY_FILES = ${TELY_FILES:%.tely=$(outdir)/%.html}
 # If we have dblatex, create the pdf, otherwise only the .xml file!
 ifeq (,$(findstring dblatex,$(MISSING_OPTIONAL)))
@@ -37,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) \
@@ -45,14 +53,16 @@ OUT_FILES = $(sort $(OUT_HTML_FILES) \
                             $(OUT_LATEX_FILES) \
                             $(OUT_TEX_FILES) \
                             $(OUT_TEXI_FILES) \
+                            $(OUT_TEXINFO_FILES) \
                             $(OUT_TELY_FILES) \
                             $(OUT_DOCBOOK_FILES))
 
-EXTRA_DIST_FILES +=\
+ALL_SOURCES +=\
  $(HTML_FILES)\
  $(HTMLY_FILES)\
  $(XML_FILES)\
  $(LYTEX_FILES)\
  $(LATEX_FILES)\
  $(TEX_FILES)\
+ $(TEXINFO_FILES)\
  $(DOCBOOK_FILES)