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

diff --cc buildscripts/makelsr.py
index c902131d04619ae6d5b85bc3a7202beeb93240a9,0000000000000000000000000000000000000000..4a89282953e495e6e07cb19f671a626928253085
mode 100755,000000..100755
--- 1/buildscripts/makelsr.py
--- /dev/null
+++ b/buildscripts/makelsr.py
@@@ -1,31 -1,0 +1,30 @@@
- dirs=['advanced','trick']
 +#!/usr/bin/python
 +import sys
 +import os
 +import os.path
 +import shutil
 +
-       in_dir=sys.argv[1]
++dirs = ['advanced','trick']
 +
 +try:
-       srcdir = os.path.join(in_dir, dir)
-       destdir = os.path.join(os.getcwd(), 'lsr', dir)
++      in_dir = sys.argv[1]
 +except:
 +      print "Please specify input_file."
 +      exit
 +
 +for dir in dirs:
-       file_names=os.listdir(destdir)
++      srcdir = os.path.join (in_dir, dir)
++      destdir = os.path.join (os.getcwd(), 'lsr', dir)
 +
-               if (file[-3:]=='.ly'):
-                       if not(file=='+.ly'):
++      file_names = os.listdir (destdir)
 +      for file in file_names:
-       file_names=os.listdir(in_dir + dir)
++              if (file.endswith ('.ly')):
++                      if (file[:3] != 'AAA'):   # or whatever we use to denote the first file
 +                              os.remove( os.path.join(destdir,file) )
 +
-               out_name=file
-               src = os.path.join(srcdir, file)
-               dest = os.path.join(destdir, out_name)
-               shutil.copyfile(src, dest)
++      file_names = os.listdir (in_dir + dir)
 +      for file in file_names:
++              src = os.path.join (srcdir, file)
++              dest = os.path.join (destdir, file)
++              shutil.copyfile (src, dest)
 +