From c08377573e22de6e76310f245c1d5bd20e921c3b Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Mon, 15 Feb 2010 00:31:38 +0000 Subject: [PATCH] Lilypond-book: Fix out-of-tree build of the regression tests --- make/lilypond-book-rules.make | 10 +++++----- make/lilypond-book-vars.make | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make index 5b8e08b915..3bdcf47745 100644 --- 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 0b7dd247fd..c8a4979c51 100644 --- 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) -- 2.39.2