From: John Mandereau <john.mandereau@gmail.com>
Date: Tue, 9 Sep 2008 07:49:15 +0000 (+0200)
Subject: Fix #671
X-Git-Tag: release/2.11.58-1~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ad1c5bb66aa178f66f0f0f1482a7625f35dd361c;hp=9e23f7717a9712c920004cbb9d51b4cc25c13f81;p=lilypond.git

Fix #671
---

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 1f925c13bd..6f0c75193b 100644
--- 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'