]> git.donarmstrong.com Git - lilypond.git/commitdiff
Build: Fix lilypond-book regtests when dblatex is not found.
authorJulien Rioux <jrioux@physics.utoronto.ca>
Tue, 14 Feb 2012 14:40:28 +0000 (09:40 -0500)
committerJulien Rioux <jrioux@physics.utoronto.ca>
Tue, 14 Feb 2012 14:40:28 +0000 (09:40 -0500)
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

index d5d4175c9a70c0eaa63a13d5e5df0c344f011062..4cec06b66140d5f77e9982743d6b87208d5b259f 100644 (file)
@@ -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 $<