Merge branch 'stable'

Conflicts:
	VERSION

diff --git a/input/regression/musicxml/GNUmakefile b/input/regression/musicxml/GNUmakefile
index 0373860e6c8222ec23463a08ce184cfe8d7a40ba..bc0f6b519d8fc744e4e0bd528d895904d85cc2f4 100644 (file)
--- 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))