(setup_paths): mingw uses std string too.

diff --git a/ChangeLog b/ChangeLog
index 33acfab1416f8b65143cf0b07ab067643e943921..805ea68fcbc631de7b1d6561449374852df84aed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/relocate.cc (setup_paths): mingw uses std string too.
+
        * lily/*.cc: various fixes for substr(ARG).
 
        * lily/sustain-pedal.cc (print): 

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 39ecf8670bcc174a191db6f2a42323950673a32d..1565eb4971307fc909f6dd83f8efb7035e1aef75 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -182,7 +182,7 @@ setup_paths (char const *argv0_ptr)
       std::string prefix = getenv ("LILYPOND_RELOCATE_PREFIX");
 #ifdef __MINGW32__
       /* Normalize file name.  */
-      prefix = File_name (prefix).to_string ().get_copy_str0 ();
+      prefix = File_name (prefix).to_string ();
 #endif /* __MINGW32__ */
       prefix_relocation (prefix);
       std::string bindir = prefix + "/bin";
@@ -237,11 +237,13 @@ setup_paths (char const *argv0_ptr)
   /* FIXME: use LILYPOND_DATADIR.  */
   if (char const *env = getenv ("LILYPONDPREFIX"))
     {
+
 #ifdef __MINGW32__
       /* Normalize file name.  */
-      env = File_name (env).to_string ().get_copy_str0 ();
-#endif
+      prefix_directory = File_name (env).to_string ();
+#else
       prefix_directory = env;
+#endif
     }
 
   global_path.append ("");