(get_default_dir): oops. Take abs () for

[lilypond.git] / lily / relocate.cc

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 1f30331e0f3e03e66f9873f411eeb65a1400b9b6..0d9e9c9a6a08850b1e35e421e29c01c4e160a4a4 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -27,7 +27,7 @@
 #include "version.hh"
 #include "warn.hh"
 
-const char * FRAMEWORKDIR = "..";
+#define FRAMEWORKDIR ".."
 
 
 int
@@ -150,7 +150,7 @@ framework_relocation (string prefix)
 #ifdef GHOSTSCRIPT_VERSION
     GHOSTSCRIPT_VERSION
 #else
-    "8.15"
+    "ghostscript-version-undefined"
 #endif
     ;
   
@@ -245,7 +245,7 @@ setup_paths (char const *argv0_ptr)
       if (argv0_prefix != compile_prefix)
        prefix_relocation (argv0_prefix);
       if (argv0_prefix != compile_prefix || string (FRAMEWORKDIR) != "..")
-       framework_relocation (bindir + "/" FRAMEWORKDIR);
+       framework_relocation (bindir + "/" + FRAMEWORKDIR);
     }
 
   /* FIXME: use LILYPOND_DATADIR.  */
@@ -285,11 +285,11 @@ setup_paths (char const *argv0_ptr)
   
   /* Adding mf/out make lilypond unchanged source directory, when setting
      LILYPONDPREFIX to lilypond-x.y.z */
-  char *suffixes[] = {"ly", "ps", "scm", 0 };
+  char const *suffixes[] = {"ly", "ps", "scm", 0 };
 
   
   vector<string> dirs;
-  for (char **s = suffixes; *s; s++)
+  for (char const **s = suffixes; *s; s++)
     {
       string path = prefix_directory + to_string ('/') + string (*s);
       dirs.push_back (path);