Lilypond-book: Fix out-of-tree build of the regression tests

diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index 5b8e08b915261af73ec2943f87fb2b01723b7df0..3bdcf477455050bcf50b2bdb7d3a2cf0f0199e16 100644 (file)
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -1,19 +1,19 @@
 .SUFFIXES: .html .xml .lytex .tex .latex
 
 $(outdir)/%.html:  %.html
-       ../../../out/bin/lilypond-book -o $(outdir) $<
+       $(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
 $(outdir)/%.html:  %.xml
-       ../../../out/bin/lilypond-book -o $(outdir) $<
+       $(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
 $(outdir)/%.tex:  %.lytex
-       ../../../out/bin/lilypond-book --pdf -o $(outdir) $<
+       $(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
 
 $(outdir)/%.tex:  %.tex
-       ../../../out/bin/lilypond-book --pdf -o $(outdir) $<
+       $(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
 
 $(outdir)/%.tex:  %.latex
-       ../../../out/bin/lilypond-book --pdf -o $(outdir) $<
+       $(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
 
 $(outdir)/%.pdf:  $(outdir)/%.tex
        cd $(outdir) && pdflatex $(notdir $<)

diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make
index 0b7dd247fdd3e0076ab88bef3b38aeff11c164af..c8a4979c518486d80be232c6f610df495c3fad0e 100644 (file)
--- a/make/lilypond-book-vars.make
+++ b/make/lilypond-book-vars.make
@@ -1,5 +1,11 @@
 # rules for directories with html files.
 
+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)
+
 LILYBOOK_HTML_FILES = $(call src-wildcard,*.html)
 LILYBOOK_XML_FILES = $(call src-wildcard,*.xml)
 LILYBOOK_LYTEX_FILES = $(call src-wildcard,*.lytex)