From 4af237c094d56ec8f963f994b72e5106afd352ef Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 21 Dec 2005 01:31:34 +0000 Subject: [PATCH] (setup_paths): Bugfix. --- ChangeLog | 4 ++++ lily/relocate.cc | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14071c7ce3..9dc1994073 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-12-21 Jan Nieuwenhuizen + + * lily/relocate.cc (setup_paths): Bugfix. + 2005-12-21 Han-Wen Nienhuys * stepmake/bin/install.py (dest): don't create existing. diff --git a/lily/relocate.cc b/lily/relocate.cc index 0fae879b51..39abfc74d7 100644 --- 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); -- 2.39.2