(setup_paths): Bugfix.

diff --git a/ChangeLog b/ChangeLog
index 14071c7ce3bd90a4da7359b36b7f21d5a8722042..9dc1994073ba77138ecda5f808583bad50abdc0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-21  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/relocate.cc (setup_paths): Bugfix.
+
 2005-12-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * stepmake/bin/install.py (dest): don't create existing.

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 0fae879b518249ed4cd0656c9ca27b91faba0b1a..39abfc74d79e8ccd7e9adb9b8b58e93f144138d1 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -157,15 +157,15 @@ setup_paths (char const *argv0_ptr)
     {
       String argv0_abs;
       if (argv0_filename.is_absolute ())
-       argv0_abs = argv0_abs;
+       argv0_abs = argv0_filename.to_string ();
       else if (argv0_filename.dir_.length ())
-       argv0_abs = get_working_directory () + "/" + String (argv0_filename.to_string ());
+       argv0_abs = get_working_directory ()
+         + "/" + String (argv0_filename.to_string ());
       else
        {
          /* Find absolute ARGV0 name, using PATH.  */
          File_path path;
          path.parse_path (getenv ("PATH"));
-
       
 #ifndef __MINGW32__
          String argv0_abs = path.find (argv0_filename.to_string ());
@@ -177,7 +177,6 @@ setup_paths (char const *argv0_ptr)
          if (argv0_abs.is_empty ())
            programming_error ("can't find absolute argv0.");
        }
-
       
       String bindir = dir_name (argv0_abs);
       String argv0_prefix = dir_name (bindir);