(setup_paths): Bugfix for invoking from bindir,

as ./program.

diff --git a/ChangeLog b/ChangeLog
index 8cc4287df15b0e6ece5a83ebd7b24aca8679d878..15e82daed1d1ccf0cbfc1870bb86bea46be38259 100644 (file)
--- 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 d8efda1a41d3115efc4c5384d56f1f85109a636a..08814e7e268c759d8f9a0667ee6f958ed90ac6cb 100644 (file)
--- 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);
     }