Merge branch 'master' into lilypond/translation

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

diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index bab711e6d3ca98cce89e1db101ed85e90701ba06..b0cf7663b158b43c687b6749c9b0988c1bd9c223 100644 (file)
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -5,6 +5,9 @@
 $(outdir)/%.html:  %.html
        $(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
+$(outdir)/%.html:  %.htmly
+       $(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
+
 $(outdir)/%.html:  %.xml
        $(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
@@ -20,9 +23,11 @@ $(outdir)/%.tex:  %.tex
 $(outdir)/%.tex:  %.latex
        $(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
 
+# Add the tex => pdf rule only if we have pdflatex
+ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.tex
-       cd $(outdir) && pdflatex $(notdir $<)
-
+       cd $(outdir) && $(PDFLATEX) $(notdir $<)
+endif
 
 ############## Texinfo ######################
 
@@ -44,5 +49,8 @@ $(outdir)/%.texi:  %.tely
 $(outdir)/%.xml:  %.lyxml
        $(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
 
+# Add the xml => pdf rule only if we have dblatex
+ifeq (,$(findstring dblatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.xml
-       cd $(outdir) && dblatex $(notdir $<)
+       cd $(outdir) && $(DBLATEX) $(notdir $<)
+endif