From e8bb4dcdf244ccda234b63df0a78635cf066be4c Mon Sep 17 00:00:00 2001 From: Julien Rioux Date: Tue, 14 Feb 2012 09:40:28 -0500 Subject: [PATCH] Build: Fix lilypond-book regtests when dblatex is not found. When dblatex is not installed, only the docbook .xml files are created by a `make doc' but not the .pdf files. We need to filter those .xml files out of the list of collated files, otherwise lilypond-book thinks that they are musicxml files and fails to process them through musicxml2ly. --- input/regression/lilypond-book/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/regression/lilypond-book/GNUmakefile b/input/regression/lilypond-book/GNUmakefile index d5d4175c9a..4cec06b661 100644 --- a/input/regression/lilypond-book/GNUmakefile +++ b/input/regression/lilypond-book/GNUmakefile @@ -28,7 +28,7 @@ XML_FILES = $(filter-out include%,$(call src-wildcard,*.xml)) local-test: $(OUT_FILES) $(outdir)/collated-files.list: $(OUT_FILES) - echo $(sort $(OUT_FILES)) > $@ + echo $(sort $(filter-out %.xml,$(OUT_FILES))) > $@ $(outdir)/suffix-texi.texi: suffix-texi.texi $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET) $(INIT_LY_SOURCES) $(SCHEME_SOURCES) LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) --redirect-lilypond-output $< -- 2.39.2