From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 28 Dec 2005 15:14:04 +0000 (+0000)
Subject: (setup_paths): Bugfix for invoking from bindir,
X-Git-Tag: release/2.7.26~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=77d423a502bfb7b3fd7a9f908f6bb167a1741ef0;p=lilypond.git

(setup_paths): Bugfix for invoking from bindir,
as ./program.
---

diff --git a/ChangeLog b/ChangeLog
index 8cc4287df1..15e82daed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-28  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* lily/relocate.cc (setup_paths): Bugfix for invoking from bindir,
+	as ./program.
+
 2005-12-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* lily/grob-property.cc (internal_set_property): don't abort on
diff --git a/lily/relocate.cc b/lily/relocate.cc
index d8efda1a41..08814e7e26 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -193,6 +193,8 @@ setup_paths (char const *argv0_ptr)
       
       String bindir = dir_name (argv0_abs);
       String argv0_prefix = dir_name (bindir);
+      if (bindir == ".")
+	argv0_prefix = "..";
       if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory))))
 	set_relocation (bindir, argv0_prefix);
     }