(setup_paths): fix: LILYPOND_RELOCATE_PREFIX.

(main): read LILYPOND_VERBOSE as the first thing.

diff --git a/ChangeLog b/ChangeLog
index 9cde745109cd1a59a7a505465cc51e2ee5bfc11c..a0c6d7427c81f5a6f8fa6582f55c4b4a088bb394 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/main.cc (setup_paths): fix: LILYPOND_RELOCATE_PREFIX.
+       (main): read LILYPOND_VERBOSE as the first thing.
+
        * stepmake/aclocal.m4: remove INSTALL variable.
 
        * GNUmakefile.in ($(tree-share-prefix)/mf-link-tree link-mf-tree):

diff --git a/lily/main.cc b/lily/main.cc
index 65b4f396a6f92182e0e223d1289e42f2467a0f52..f770d59854d8bf1a17c89db8e7101d9d255e8c94 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -390,11 +390,18 @@ setup_paths (char const *argv0)
 {
   prefix_directory = LILYPOND_DATADIR;
 
-  if (relocate_binary)
+  
+  if (relocate_binary
+      && getenv ("LILYPOND_RELOCATE_PREFIX"))
+    {
+      String prefix = getenv ("LILYPOND_RELOCATE_PREFIX");
+      /*
+       fixme: need different sep for mingw? 
+      */
+      set_relocation (prefix + "/bin", prefix);
+    }
+  else if (relocate_binary)
     {
-      if (getenv ("LILYPOND_VERBOSE"))
-       be_verbose_global = true;
-      
 #if defined (__CYGWIN__) || defined (__MINGW32__)
       String s = argv0;
       s.substitute ('\\', '/');
@@ -404,9 +411,7 @@ setup_paths (char const *argv0)
 
       /* if name contains slashes, we should not look in $PATH */
       String argv0_abs;
-      if (getenv ("LILYPOND_RELOCATE_PREFIX"))
-       argv0_abs = getenv ("LILYPOND_RELOCATE_PREFIX");
-      else if (argv0[0] == '/')
+      if (argv0[0] == '/')
        argv0_abs = argv0_abs;
       else if (String (argv0).index ('/') > 0)
        argv0_abs = get_working_directory () + "/" + String (argv0);
@@ -827,6 +832,9 @@ setup_guile_env ()
 int
 main (int argc, char **argv)
 {
+  if (getenv ("LILYPOND_VERBOSE"))
+    be_verbose_global = true;
+
   setup_localisation ();
   parse_argv (argc, argv);
   if (isatty (STDIN_FILENO))