X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=f640801b84a647ecffec6878d371c6b4a3706915;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=ae4c86dd2ae9b8f339eb4ce132f5192f0a52f0e3;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git

diff --git a/lily/main.cc b/lily/main.cc
index ae4c86dd2a..f640801b84 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -89,7 +89,7 @@ bool make_print = true;
 
 
 bool relocate_binary =
-#if 1
+#if ARGV0_RELOCATION
   true;
 #else
   false
@@ -427,7 +427,6 @@ main_with_guile (void *, int, char **)
       *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }
-  
   delete option_parser;
   option_parser = 0;
 
@@ -541,12 +540,7 @@ parse_argv (int argc, char **argv)
 	  break;
 
 	case 'f':
-	  {
-	    vector<string> components
-	      = string_split (option_parser->optional_argument_str0_, ',');
-	    for (vsize i = 0; i < components.size (); i++)
-	      add_output_format (components[i]);
-	  }
+	  output_format_global = option_parser->optional_argument_str0_;
 	  break;
 
 	case 'H':