X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=SConstruct;h=92afa9568b07b6d6bfbc0099a8f27d1334257af4;hb=edfff5187f7274a7b9174b5527b9b746d3cd5c1c;hp=5a07e1b33aec49b71850c3d4c66e19032abea440;hpb=2f19ea6bdfd30afec339c5695b9e2df4df755896;p=lilypond.git

diff --git a/SConstruct b/SConstruct
index 5a07e1b33a..92afa9568b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -22,7 +22,7 @@ Run from build tree
     PATH=$run/bin:$PATH
 
     #optionally, if you do not use custom.py below
-    #export LILYPONDPREFIX=$run/share/lilypond/<VERSION>
+    #export LILYPOND_DATADIR=$run/share/lilypond/<VERSION>
 
     lilypond input/simple
 
@@ -171,10 +171,17 @@ srcdir = Dir ('.').srcnode ().abspath
 #ugh
 sys.path.append (os.path.join (srcdir, 'stepmake', 'bin'))
 
-import packagepython
-
-package = packagepython.Package (srcdir)
-version = packagepython.version_tuple_to_str (package.version)
+try:
+    import packagepython
+    packagepython.Package (srcdir)
+    packagepython.version_tuple_to_str (package.version)
+except:
+    print '*** FIXME: no packagepython.  setting version to 1.0'
+    class Package:
+        name = 'lilypond'
+        release_dir = '.'
+    package = Package
+    version = '1.0'
 
 ENV = { 'PYTHONPATH': '' }
 for key in ['GUILE_LOAD_PATH', 'LD_LIBRARY_PATH', 'PATH', 'PKG_CONFIG_PATH',
@@ -245,7 +252,7 @@ if not os.path.exists (cachedir):
 
 CacheDir (cachedir)
 
-# No need to set $LILYPONDPREFIX to run lily, but cannot install...
+# No need to set $LILYPOND_DATADIR to run lily, but cannot install...
 if env['debugging'] and not 'install' in COMMAND_LINE_TARGETS:
     env['prefix'] = run_prefix
 
@@ -658,17 +665,17 @@ SConscript ('buildscripts/builder.py')
 env.PrependENVPath ('PATH',
             os.path.join (env['absbuild'], env['out'], 'usr/bin'))
 
-LILYPONDPREFIX = os.path.join (run_prefix, 'share/lilypond/', version)
+LILYPOND_DATADIR = os.path.join (run_prefix, 'share/lilypond/', version)
 
-if not os.path.exists (LILYPONDPREFIX):
-    os.makedirs (LILYPONDPREFIX)
+if not os.path.exists (LILYPOND_DATADIR):
+    os.makedirs (LILYPOND_DATADIR)
 
-env.Command (LILYPONDPREFIX, ['#/SConstruct', '#/VERSION'], symlink_tree)
-env.Depends ('lily', LILYPONDPREFIX)
+env.Command (LILYPOND_DATADIR, ['#/SConstruct', '#/VERSION'], symlink_tree)
+env.Depends ('lily', LILYPOND_DATADIR)
 
 env.Append (ENV = {
-    'LILYPONDPREFIX' : LILYPONDPREFIX,
-    'TEXMF' : '{$LILYPONDPREFIX,'
+    'LILYPOND_DATADIR' : LILYPOND_DATADIR,
+    'TEXMF' : '{$LILYPOND_DATADIR,'
     + os.popen ('kpsexpand \$TEXMF').read ()[:-1] + '}',
     })
 
@@ -781,7 +788,7 @@ env.Command (version_hh, '#/VERSION',
 # post-config environment update
 env.Append (
     run_prefix = run_prefix,
-    LILYPONDPREFIX = LILYPONDPREFIX,
+    LILYPOND_DATADIR = LILYPOND_DATADIR,
 
     # FIXME: move to lily/SConscript?
     LIBPATH = [os.path.join (absbuild, 'flower', env['out'])],