X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmup2ly.py;h=88868a8e03f5f13f5c4468add89df1f0bf24fd45;hb=8438b824fb221159742957c2eeab761effe73be4;hp=6db68dd8fffb7c67b595e61255d0f9373683080f;hpb=3189be8f879384108e2d99fe83c972d68c5215dd;p=lilypond.git

diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py
index 6db68dd8ff..88868a8e03 100644
--- a/scripts/mup2ly.py
+++ b/scripts/mup2ly.py
@@ -37,17 +37,17 @@ import tempfile
 
 # if set, LILYPONDPREFIX must take prevalence
 # if datadir is not set, we're doing a build and LILYPONDPREFIX 
-datadir = '@local_package_datadir@'
+datadir = '@local_lilypond_datadir@'
 if os.environ.has_key ('LILYPONDPREFIX') \
-   or '@local_package_datadir@' == '@' + 'local_package_datadir' + '@':
+   or '@local_lilypond_datadir@' == '@' + 'local_lilypond_datadir' + '@':
 	datadir = os.environ['LILYPONDPREFIX']
 else:
-	datadir = '@local_package_datadir@'
+	datadir = '@local_lilypond_datadir@'
 
 sys.path.append (os.path.join (datadir, 'python'))
 sys.path.append (os.path.join (datadir, 'python/out'))
 
-program_name = 'ly2dvi'
+program_name = 'mup2ly'
 program_version = '@TOPLEVEL_VERSION@'
 original_dir = os.getcwd ()
 temp_dir = os.path.join (original_dir,  '%s.dir' % program_name)
@@ -55,9 +55,10 @@ errorport = sys.stderr
 keep_temp_dir_p = 0
 verbose_p = 0
 
+localedir = '@localedir@'
 try:
 	import gettext
-	gettext.bindtextdomain ('lilypond', '@localedir@')
+	gettext.bindtextdomain ('lilypond', localedir)
 	gettext.textdomain ('lilypond')
 	_ = gettext.gettext
 except:
@@ -313,12 +314,12 @@ def mkdir_p (dir, mode=0777):
 
 # if set, LILYPONDPREFIX must take prevalence
 # if datadir is not set, we're doing a build and LILYPONDPREFIX 
-datadir = '@datadir@'
+datadir = '@local_lilypond_datadir@'
 
 if os.environ.has_key ('LILYPONDPREFIX') :
 	datadir = os.environ['LILYPONDPREFIX']
 else:
-	datadir = '@datadir@'
+	datadir = '@local_lilypond_datadir@'
 
 
 while datadir[-1] == os.sep: