Fix #671

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 1f925c13bde7094a954d579f3e64c35cc4bc0c08..6f0c75193b995ef4baad8838303a75a89c0d1d6d 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -205,6 +205,12 @@ def get_option_parser ():
 
 lilypond_binary = os.path.join ('@bindir@', 'lilypond')
 
+# If we are called with full path, try to use lilypond binary
+# installed in the same path; this is needed in GUB binaries, where
+# @bindir is always different from the installed binary path.
+if 'bindir' in globals () and bindir:
+    lilypond_binary = os.path.join (bindir, 'lilypond')
+
 # Only use installed binary when we are installed too.
 if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary):
     lilypond_binary = 'lilypond'