(conf_flags): set sensible default for with-ncsb-dir

[lilypond.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 20bb9a49d9bf7678f2d3e255da1e4eb6ecc2ca72..9e7c40b1034e86f96d75b518ae791e7633fe1164 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -248,6 +248,8 @@ prefix = env['prefix']
 bindir = os.path.join (prefix, 'bin')
 sharedir = os.path.join (prefix, 'share')
 libdir = os.path.join (prefix, 'lib')
+libdir_package = os.path.join (libdir, package.name)
+lidbir_package_version = os.path.join (libdir_package, version)
 localedir = os.path.join (sharedir, 'locale')
 sharedir_doc_package = os.path.join (sharedir, 'doc', package.name)
 sharedir_package = os.path.join (sharedir, package.name)
@@ -858,11 +860,11 @@ def symlink_tree (target, source, env):
                           % vars ())
        os.chdir (srcdir)
 
-if env['debugging']:
+if 1: #env['debugging']:
        stamp = os.path.join (run_prefix, 'stamp')
-       env.command (stamp, ['#/SConstruct', '#/VERSION'],
+       env.Command (stamp, ['#/SConstruct', '#/VERSION'],
                     [symlink_tree, 'touch $TARGET'])
-       env.depends ('lily', stamp)
+       env.Depends ('lily', stamp)
        
 #### dist, tar
 def plus (a, b):
@@ -915,11 +917,12 @@ if env['fast']\
    and 'doc' not in COMMAND_LINE_TARGETS\
    and 'web' not in COMMAND_LINE_TARGETS\
    and 'install' not in COMMAND_LINE_TARGETS\
-   and 'clean' not in command_line_targets:
-       subdirs = ['lily', 'lily/include',
-                  'flower', 'flower/include',
+   and 'clean' not in COMMAND_LINE_TARGETS:
+       subdirs = ['lily',
+                  'flower',
                   'kpath-guile',
                   'mf',
+                  'python',
                   ]
 
 if os.path.isdir ('%(srcdir)s/CVS' % vars ()):