X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=5f9b2a77f657f3e4c02dd68518e8a7d39cf66c31;hb=ffb9d71ab52ad8d9a891f8070525d949789e5058;hp=67e22fb04e8d33d714899303fa444111a1043ba0;hpb=d04a22029df1523eda55c6dfb458246e480d6e56;p=lilypond.git

diff --git a/lily/main.cc b/lily/main.cc
index 67e22fb04e..5f9b2a77f6 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -57,6 +57,7 @@ string init_name_global;
 /* Selected output backend
    One of (gnome, ps [default], eps, scm, svg, tex, texstr)") */
 string output_backend_global = "ps";
+
 /* Output formats to generate.  */
 string output_format_global = "";
 
@@ -88,7 +89,7 @@ bool make_print = true;
 
 
 bool relocate_binary =
-#if ARGV0_RELOCATION
+#if 1
   true;
 #else
   false
@@ -211,6 +212,7 @@ dir_info (FILE *out)
       env_var_info (out, "GS_LIB");
       env_var_info (out, "GUILE_LOAD_PATH");
       env_var_info (out, "PANGO_RC_FILE");
+      env_var_info (out, "PANGO_PREFIX");
       env_var_info (out, "PATH");
     }
 }
@@ -304,7 +306,7 @@ do_chroot_jail ()
   if (components.size () != JAIL_MAX)
     {
       error (_f ("expected %d arguments with jail, found: %u", JAIL_MAX,
-		 components.size ()));
+		 (unsigned) components.size ()));
       exit (2);
     }
 
@@ -603,6 +605,9 @@ setup_guile_env ()
   sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite);
 }
 
+void
+read_relocation_dir (string);
+
 int
 main (int argc, char **argv)
 {