From: Han-Wen Nienhuys Date: Sun, 28 Dec 2008 17:26:23 +0000 (-0200) Subject: Merge branch 'stable' X-Git-Tag: release/2.12.1-1~16^2~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d664f5a7153ec2b1a1c4c9fba2d2174bf3140695;hp=1dbeded5626ac18a0e3ca98c0ed9aaeef4e5c4d0;p=lilypond.git Merge branch 'stable' Conflicts: VERSION --- diff --git a/input/regression/musicxml/GNUmakefile b/input/regression/musicxml/GNUmakefile index 0373860e6c..bc0f6b519d 100644 --- a/input/regression/musicxml/GNUmakefile +++ b/input/regression/musicxml/GNUmakefile @@ -22,4 +22,4 @@ local-WWW-2: zip zip: $(outdir)/MusicXML-TestSuite-$(TEST_SUITE_VERSION).zip $(outdir)/MusicXML-TestSuite-$(TEST_SUITE_VERSION).zip: $(MUSICXML_FILES) $(MUSICMXL_FILES) - $(ZIP) -r $@ $(MUSICXML_FILES) $(MUSICMXL_FILES) + $(ZIP) -r $@ $(addprefix $(src-dir)/,$(MUSICXML_FILES)) $(addprefix $(src-dir)/,$(MUSICMXL_FILES))