From 0041ccea4e26f1092f665530cdbf9d2ab7a2479f Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 19 Dec 2005 02:29:24 +0000 Subject: [PATCH] * 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. --- ChangeLog | 2 ++ lily/main.cc | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 74d5593628..66d3e0f87a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-12-19 Han-Wen Nienhuys + * 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 14fa300e1f..a2ba2a7bcb 100644 --- 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); -- 2.39.2