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

[lilypond.git] / scripts / lilypond-book.py

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index b9b3c67b7d4546c4bbf6a40fa0610ae416d59795..1e9acaf65a62ebe5e1f3b415c79f9fc23ed26914 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1933,8 +1933,10 @@ def main ():
     if global_options.process_cmd:
         includes = global_options.include_path
         if global_options.lily_output_dir:
-            includes = [os.path.abspath(global_options.lily_output_dir] + includes
-        global_options.process_cmd += ' '.join ([(' -I %s' % ly.mkarg (p))
+            # This must be first, so lilypond prefers to read .ly
+            # files in the other lybookdb dir.
+            includes = [os.path.abspath(global_options.lily_output_dir)] + includes
+        global_options.process_cmd += ' '.join ([' -I %s' % ly.mkarg (p)
                                                  for p in includes])
 
     if global_options.format in (TEXINFO, LATEX):