Merge branch 'fixedmerge' into HEAD

[lilypond.git] / make / midi-rules.make

diff --git a/make/midi-rules.make b/make/midi-rules.make
index 219eb262cea6ef91e8c88160e9eab6f2b6f9f2cd..7b3f149d9643832dc72e02e23d6a27b286ddbc13 100644 (file)
--- a/make/midi-rules.make
+++ b/make/midi-rules.make
@@ -5,7 +5,8 @@ $(outdir)/%.ly:  %.midi
 
 $(outdir)/%.midi: %.ly $(LILYPOND_BINARY)
        touch $(foreach f, $(HEADER_FIELDS), $(outdir)/$*.$f)
-       $(LILYPOND_BINARY) $(HEADER_FIELDS:%=-H %) -o $(outdir) $<
+       $(buildscript-dir)/run-and-check "$(LILYPOND_BINARY) $(HEADER_FIELDS:%=-H %) -o $(outdir) $<" "$*.log"
+       cp $< $(outdir)
 
 $(outdir)/%-midi.ly: $(outdir)/%.midi $(MIDI2LY)
        (echo '\header {'; for f in $(HEADER_FIELDS); do echo -n $$f'="'; cat $(outdir)/$*.$$f; echo '"'; done; echo '}') > $(outdir)/$*.header