From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 3 Jan 2008 01:00:27 +0000 (-0200)
Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.38-1~135
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=44ec216ed7a8f92311cdb8ea925d6e5cab4a72a0;p=lilypond.git

Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

Conflicts:

	input/lsr/GNUmakefile
---

44ec216ed7a8f92311cdb8ea925d6e5cab4a72a0
diff --cc input/lsr/GNUmakefile
index aae334bda0,df45b73222..1ca2cbbf52
--- a/input/lsr/GNUmakefile
+++ b/input/lsr/GNUmakefile
@@@ -12,7 -12,7 +12,7 @@@ IN_ITELY_FILES = $(call src-wildcard,*-
  GENERATED_ITELY_FILES = $(IN_ITELY_FILES:%-intro.itely=$(outdir)/%.itely)
  
  $(outdir)/%.itely: %-intro.itely %.snippet-list
- 	xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py --name=$@ --template=$< < $(filter %.snippet-list, $^)
 -	xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py -f printfilename,texidoc,verbatim --name=$@ --template=$< < $*.snippet-list
++	xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py -f printfilename,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
  
  $(outdir)/snippets.texi: snippets.tely $(GENERATED_ITELY_FILES)
  	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<