(framework_relocation): use INSTALLER_PREFIX.

diff --git a/ChangeLog b/ChangeLog
index 219363435a0650a10ee353b255a539c5536ce497..598c548caa0ca3761e7419171a7dcb6713c321d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-05-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * lily/relocate.cc (framework_relocation): use INSTALLER_PREFIX.
+
        * *.py: more 4 space indents.
 
        * autogen.sh (conf_flags): set sensible default for with-ncsb-dir

diff --git a/lily/include/relocate.hh b/lily/include/relocate.hh
index 77929598e42bbe41ee4c75926c953bb13dc558e9..e3af270a88e2c6d1bc9ab955abfa6c9bfc2cbb7f 100644 (file)
--- a/lily/include/relocate.hh
+++ b/lily/include/relocate.hh
@@ -12,6 +12,11 @@
 
 #include "std-string.hh"
 
+void read_relocation_dir (string dirname);
+void read_relocation_file (string filename);
+string read_line (FILE *f);
+string expand_environment_variables (string orig);
+
 int sane_putenv (char const *key, string value, bool overwrite);
 void setup_paths (char const *argv0);
 extern bool relocate_binary;

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 64092fcc889c8518c8d12a1a9db7f94f933bb7d1..34b7962a1a1acad456a3c878ff4bb218a425cddd 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -120,12 +120,13 @@ framework_relocation (string prefix)
   if (be_verbose_global)
     warning (_f ("Relocation: framework_prefix=%s", prefix));
 
-  sane_putenv ("INSTALLER_ROOT", prefix, true);
+  sane_putenv ("INSTALLER_PREFIX", prefix, true);
               
   read_relocation_dir (prefix + "/etc/relocate/");
 
-#ifdef OLD_RELOCATION
   string bindir = prefix + "/bin";
+
+#ifdef OLD_RELOCATION
   string datadir = prefix + "/share";
   string libdir = prefix + "/lib";
   string sysconfdir = prefix + "/etc";
@@ -377,6 +378,9 @@ read_line (FILE *f)
 void
 read_relocation_file (string filename)
 {
+  if (be_verbose_global)
+    progress_indication (_f ("Relocation file %s", filename.c_str ()));
+      
   char const *cname = filename.c_str ();
   FILE *f = fopen (cname, "r");
   if (!f)
@@ -426,7 +430,7 @@ read_relocation_dir (string dirname)
       File_name name (ent->d_name);
       if (name.ext_ == "reloc")
        {
-         read_relocation_file (name.to_string ());
+         read_relocation_file (dirname + "/" + name.to_string ());
        }
     }
 }