* lily/main.cc (setup_paths)[__MINGW32__]: Do not assume argv0 is

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 1aae18e923de43549e8cf28fb8fb691153ea075a..f3b8689d9b428badc5bcb598659dcd01e603e0e5 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -322,7 +322,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));
@@ -333,8 +333,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";