]> git.donarmstrong.com Git - lilypond.git/commitdiff
lilypond-book: Set include path for --lily-output-dir option. release/2.15.35-1
authorJulien Rioux <jrioux@physics.utoronto.ca>
Tue, 27 Mar 2012 13:27:02 +0000 (09:27 -0400)
committerJulien Rioux <jrioux@physics.utoronto.ca>
Tue, 27 Mar 2012 13:29:13 +0000 (09:29 -0400)
Fixes in-tree build failure after the regression test was added.

scripts/lilypond-book.py

index a78fdfc02e1733992778931f15d6de1d952cacaf..41df22da59ee4aafe1547f2159dd15f32f1925e7 100644 (file)
@@ -633,6 +633,10 @@ def do_options ():
     global_options.information = {'program_version': ly.program_version, 'program_name': ly.program_name }
     global_options.original_dir = original_dir
 
+    if global_options.lily_output_dir:
+        global_options.lily_output_dir = os.path.expanduser (global_options.lily_output_dir)
+        global_options.include_path.insert (0, inverse_relpath (original_dir, global_options.lily_output_dir))
+
     if global_options.output_dir:
         global_options.output_dir = os.path.expanduser (global_options.output_dir)
         global_options.include_path.insert (0, inverse_relpath (original_dir, global_options.output_dir))