From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 2 Nov 2005 12:52:13 +0000 (+0000)
Subject: (setup_paths)[__MINGW32__]: Do not assume argv0 is
X-Git-Tag: release/2.6.5~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=01eecd43eb5c969c02b677caef06d6fe57c16321;p=lilypond.git

(setup_paths)[__MINGW32__]: Do not assume argv0 is
absolute.  Better diagnostics.
---

diff --git a/ChangeLog b/ChangeLog
index 718bc05d7b..f972e20df6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-02  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* lily/main.cc (setup_paths)[__MINGW32__]: Do not assume argv0 is
+	absolute.  Better diagnostics.
+
 2005-11-01  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* lily/main.cc (setup_paths)[!__MINGW32__]: Bugfix: if argv0 is
diff --git a/lily/main.cc b/lily/main.cc
index a89edb1844..551a0afd12 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -320,7 +320,7 @@ setup_paths (char const* argv0)
   if (getenv ("LILYPOND_VERBOSE"))
     be_verbose_global = true;
 
-#ifndef __MINGW32__
+#if 1 /* Huh, argv0 is not absolute on windows?  ndef __MINGW32__ */
   File_path p;
   p.parse_path (getenv ("PATH"));
   String bindir = dir_name (p.find (argv0));
@@ -331,8 +331,10 @@ setup_paths (char const* argv0)
   if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory))))
     {
       if (be_verbose_global)
-	warning (_f ("argv0 relocation: argv0=%s, prefix=%s", argv0,
-		     prefix_directory));
+	warning (_f ("argv0 relocation: prefix=%s, argv0=%s, argv0_prefix=%s",
+		     prefix_directory,
+		     argv0,
+		     argv0_prefix.to_str0 ()));
       String datadir = argv0_prefix + "/share";
       String libdir = argv0_prefix + "/lib";
       String localedir = datadir + "/locale";