X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Flilylib.py;h=156c9b7c8da95e21516f0775685ccff32f0fa242;hb=ddec675922143f1831ea38fcb4a1caf78777ecf9;hp=9197d01f95af98ebacbd8e6e2b7941038f5ad61e;hpb=4b4c6622a8fad00e098e12e854de6d924988abf5;p=lilypond.git

diff --git a/python/lilylib.py b/python/lilylib.py
index 9197d01f95..156c9b7c8d 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -24,14 +24,14 @@ import optparse
 # it as we do with teTeX on Red Hat Linux: set some environment var
 # (PYTHONPATH) in profile)
 
-# If set, LILYPONDPREFIX must take prevalence
-# if datadir is not set, we're doing a build and LILYPONDPREFIX
+# If set, LILYPOND_DATADIR must take prevalence
+# if datadir is not set, we're doing a build and LILYPOND_DATADIR
 
 datadir = '@local_lilypond_datadir@'
 if not os.path.isdir (datadir):
     datadir = '@lilypond_datadir@'
-if os.environ.has_key ('LILYPONDPREFIX') :
-    datadir = os.environ['LILYPONDPREFIX']
+if os.environ.has_key ('LILYPOND_DATADIR') :
+    datadir = os.environ['LILYPOND_DATADIR']
     while datadir[-1] == os.sep:
 	datadir= datadir[:-1]
 
@@ -130,6 +130,7 @@ def ossystem_system (cmd,
                      log_file=None):
 
 
+    name = command_name (cmd)
     if be_verbose:
 	show_progress = 1
 	progress (_ ("Invoking `%s\'") % cmd)
@@ -199,7 +200,7 @@ class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
 			       metavar)
 
     def format_usage(self, usage):
-        return _("Usage: %s\n") % usage
+        return _("Usage: %s") % usage + '\n'
 
     def format_description(self, description):
 	return description