* lily/main.cc (setup_paths): read LILYPOND_RELOCATE_PREFIX

* lily/main.cc (setup_paths): don't inspect $PATH for argv0 with
slashes.
(prepend_env_path): more verbosity.

diff --git a/ChangeLog b/ChangeLog
index 74d55936288ec38001e34b09e2bd19e9e6363043..66d3e0f87a8c1254629d2b31450ba890daee5317 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-12-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/main.cc (setup_paths): read LILYPOND_RELOCATE_PREFIX
+
        * stepmake/stepmake/install-targets.make (local-uninstall): idem.
 
        * stepmake/stepmake/install-out-targets.make (local-install-outfiles): idem.

diff --git a/lily/main.cc b/lily/main.cc
index 14fa300e1f3c2121565d0a8ae2348e27b09d02f1..a2ba2a7bcbf268845bdf91280f58aadee551646f 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -404,7 +404,9 @@ setup_paths (char const *argv0)
 
       /* if name contains slashes, we should not look in $PATH */
       String argv0_abs;
-      if (argv0[0] == '/')
+      if (getenv ("LILYPOND_RELOCATE_PREFIX"))
+       argv0_abs = getenv ("LILYPOND_RELOCATE_PREFIX");
+      else if (argv0[0] == '/')
        argv0_abs = argv0_abs;
       else if (String (argv0).index ('/') > 0)
        argv0_abs = get_working_directory () + "/" + String (argv0);