diff options
| author | Julien Rioux <jrioux@physics.utoronto.ca> | 2012-04-30 09:07:11 -0400 |
|---|---|---|
| committer | Julien Rioux <jrioux@physics.utoronto.ca> | 2012-05-17 16:45:05 -0400 |
| commit | 38e1cad48d14f0b0f9286b4bb8891051a5f82d1e (patch) | |
| tree | 65249dbb2b8d134b532296568defbce39755b05f /scripts | |
| parent | e4f4c55529f6fd7e5f6276400e55ca517d6db210 (diff) | |
Fix the linking of files from lilypond by lilypond-book.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lilypond-book.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 41df22da59..7fcec344de 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -464,12 +464,15 @@ def do_process_cmd (chunks, input_name, options): else: progress (_ ("All snippets are up to date...")) - if options.lily_output_dir != options.output_dir: - output_files = split_output_files (options.lily_output_dir) + progress (_ ("Linking files...")) + abs_lily_output_dir = os.path.join (options.original_dir, options.lily_output_dir) + abs_output_dir = os.path.join (options.original_dir, options.output_dir) + if abs_lily_output_dir != abs_output_dir: + output_files = split_output_files (abs_lily_output_dir) for snippet in snippets: - snippet.link_all_output_files (options.lily_output_dir, + snippet.link_all_output_files (abs_lily_output_dir, output_files, - options.output_dir) + abs_output_dir) ### @@ -641,6 +644,8 @@ def do_options (): 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)) + global_options.include_path.insert (0, ".%s" % os.path.sep) + # Load the python packages (containing e.g. custom formatter classes) # passed on the command line nr = 0 |