From: Julien Rioux <jrioux@physics.utoronto.ca>
Date: Fri, 2 Sep 2011 19:26:20 +0000 (-0400)
Subject: Fix issue #1852: manuals needs more explicit dependencies.
X-Git-Tag: release/2.15.12-1~37
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1b99f1907fb77b0f3a0e65725776782c3eeaa025;p=lilypond.git

Fix issue #1852: manuals needs more explicit dependencies.

Dependencies are already being tracker by lilypond-book.py,
which produces .dep files containing make rules. The file
stepmake/stepmake/generic-targets.make includes them into
the build.

The problem is that the .dep files contain errors.

We fix the .dep files produced by lilypond-book.py by
  1) using the relative path to the target file,
  2) using the correct file extension for the target file.
---

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index b1256529fd..0814739b47 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -674,6 +674,7 @@ def main ():
     else:
         global_options.lily_output_dir = os.path.abspath(global_options.output_dir)
 
+    relative_output_dir = global_options.output_dir
 
     identify ()
     try:
@@ -686,9 +687,8 @@ def main ():
 
     base_file_name = os.path.splitext (os.path.basename (files[0]))[0]
     dep_file = os.path.join (global_options.output_dir, base_file_name + '.dep')
-    final_output_file = os.path.join (global_options.output_dir,
-                     base_file_name
-                     + '.%s' % global_options.format)
+    final_output_file = os.path.join (relative_output_dir,
+                     base_file_name + global_options.formatter.default_extension)
 
     os.chdir (original_dir)
     file (dep_file, 'w').write ('%s: %s'