Finish rename of LILYPONDPREFIX to LILYPOND_DATADIR. Remove confusion

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 30b9926423323c6d8e0da1879f8f8f3c0f73b131..3c269b1a34d914c7cb6fbf1c2fc80883f9be45d0 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -137,7 +137,7 @@ static char const *WARRANTY
 /* Where the init files live.  Typically:
    LILYPOND_DATADIR = /usr/share/lilypond
 */
-string prefix_directory;
+string lilypond_datadir;
 
 /* The jail specification: USER,GROUP,JAIL,DIR. */
 string jail_spec;
@@ -200,9 +200,10 @@ dir_info (FILE *out)
   fputs ("\n", out);
   fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR);
   env_var_info (out, "LILYPONDPREFIX");
+  env_var_info (out, "LILYPOND_DATADIR");
   fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR);
 
-  fprintf (out, "\nEffective prefix: \"%s\"\n", prefix_directory.c_str ());
+  fprintf (out, "\nEffective prefix: \"%s\"\n", lilypond_datadir.c_str ());
 
   if (relocate_binary)
     {
@@ -378,8 +379,8 @@ main_with_guile (void *, int, char **)
   /* Engravers use lily.scm contents, need to make Guile find it.
      Prepend onto GUILE %load-path, very ugh. */
 
-  prepend_load_path (prefix_directory);
-  prepend_load_path (prefix_directory + "/scm");
+  prepend_load_path (lilypond_datadir);
+  prepend_load_path (lilypond_datadir + "/scm");
 
   if (be_verbose_global)
     dir_info (stderr);
@@ -616,9 +617,6 @@ setup_guile_env ()
               "104857600", overwrite);
 }
 
-void
-read_relocation_dir (string);
-
 int
 main (int argc, char **argv)
 {