From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 4 Jun 2007 01:14:35 +0000 (-0300)
Subject: always canonicalize datadir path
X-Git-Tag: release/2.11.26-1~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6e2bab4168a86c459a5eea83abdda23d9017f27d;p=lilypond.git

always canonicalize datadir path
---

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 2ff9fc44d3..42c54a65ff 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -230,12 +230,8 @@ setup_paths (char const *argv0_ptr)
 
   if (char const *env = getenv ("LILYPOND_DATADIR"))
     {
-#ifdef __MINGW32__
       /* Normalize file name.  */
       lilypond_datadir = File_name (env).to_string ();
-#else
-      lilypond_datadir = env;
-#endif
     }
 
   /* When running from build dir, a full LILYPOND_DATADIR is set-up at
@@ -245,6 +241,9 @@ setup_paths (char const *argv0_ptr)
   if (!is_dir (lilypond_datadir.c_str ())
       && is_dir (build_datadir_current.c_str ()))
     lilypond_datadir = build_datadir_current;
+
+
+  lilypond_datadir = File_name (lilypond_datadir).canonicalized().to_string();
   
   global_path.append ("");