From: Jan Nieuwenhuizen Date: Mon, 2 Jan 2006 12:38:06 +0000 (+0000) Subject: (setup_paths): Add more debugging verbosity. X-Git-Tag: release/2.7.27~27 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ab685a4504e0aef61caf91085e900e05b6aa0194;p=lilypond.git (setup_paths): Add more debugging verbosity. --- diff --git a/ChangeLog b/ChangeLog index c54ddaed00..b997bb2cdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-01-02 Jan Nieuwenhuizen + + * lily/relocate.cc (setup_paths): Add more debugging verbosity. + 2006-01-02 Han-Wen Nienhuys * scm/lily.scm (lilypond-all): oops. remove debugging hack. diff --git a/lily/relocate.cc b/lily/relocate.cc index ecc8a787ea..a7ee0f01aa 100644 --- a/lily/relocate.cc +++ b/lily/relocate.cc @@ -191,16 +191,28 @@ setup_paths (char const *argv0_ptr) { String argv0_abs; if (argv0_filename.is_absolute ()) - argv0_abs = argv0_filename.to_string (); + { + argv0_abs = argv0_filename.to_string (); + if (be_verbose_global) + warning (_f ("Relocation: is absolute: argv0=%s", argv0_ptr)); + } 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 ()); + if (be_verbose_global) + warning (_f ("Relocation: from cwd: argv0=%s", argv0_ptr)); + } else { /* Find absolute ARGV0 name, using PATH. */ File_path path; path.parse_path (getenv ("PATH")); - + + if (be_verbose_global) + warning (_f ("Relocation: from PATH=%s\nargv0=%s", + path.to_string ().get_str0 (), argv0_ptr)); + #ifndef __MINGW32__ String argv0_abs = path.find (argv0_filename.to_string ()); #else /* __MINGW32__ */