Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index d5049e5dab3901602f1cb54f433210bf7a0f01d9..3f6f15007bba70081929d93b91e50c9d63a9d16e 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)
+libdir_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)
@@ -352,8 +354,8 @@ def configure (target, source, env):
        test_program (optional, 'bison', '1.25', 'Bison -- parser generator',
                        'bison')
        test_program (optional, 'dvips', '0.0', 'Dvips', 'tetex-bin')
-       test_program (optional, 'fontforge', '0.0.20041224', 'FontForge',
-                     'fontforge')
+#      test_program (optional, 'fontforge', '0.0.20041224', 'FontForge',
+#                    'fontforge')
        test_program (optional, 'flex', '0.0', 'Flex -- lexer generator',
                      'flex')
        test_program (optional, 'guile', '1.6', 'GUILE scheme', 'guile')
@@ -656,6 +658,8 @@ env.Append (
        sharedir_package = sharedir_package,
        sharedir_doc_package = sharedir_doc_package,
        sharedir_package_version = sharedir_package_version,
+       libdir_package = libdir_package,
+       libdir_package_version = libdir_package_version,
 
        # global build verbosity switch
        __verbose = ' --verbose',
@@ -665,7 +669,6 @@ env.Append (
        LILYPOND_BOOK = BUILD_LILYPOND_BOOK,
        LILYPOND_BOOK_FORMAT = 'texi-html',
        MAKEINFO_FLAGS = '--css-include=$srcdir/Documentation/texinfo.css',
-       # should not be necessary
        # PYTHONPATH = ['$absbuild/python/$out'],
        TEXI2DVI_PAPERSIZE = '@afourpaper',
        TEXI2DVI_FLAGS = [ '-t$TEXI2DVI_PAPERSIZE'],
@@ -772,7 +775,7 @@ env.Append (
 #                       os.path.join (absbuild, 'Documentation/user',
 #                                     env['out']),
                         ],
-       makeinfo_path = ['.', '$srcdir/Documentation/user',
+       MAKEINFO_PATH = ['.', '$srcdir/Documentation/user',
                         '$absbuild/Documentation/user/$out'],
        )
 
@@ -824,7 +827,8 @@ def symlink_tree (target, source, env):
              ('scripts/',   'bin/ps2png'),
              ('mf',         'share/lilypond/%(ver)s/dvips/mf-out'),
              ('#ps',        'share/lilypond/%(ver)s/dvips/ps'),
-             ('#ps',        'share/lilypond/%(ver)s/tex/music-drawing-routines.ps'),
+             ('#ps/music-drawing-routines.ps',
+              'share/lilypond/%(ver)s/tex/music-drawing-routines.ps'),
              ('mf',         'share/lilypond/%(ver)s/otf'),
              ('mf',         'share/lilypond/%(ver)s/tfm'),
              ('tex',        'share/lilypond/%(ver)s/tex/enc'),
@@ -840,10 +844,10 @@ def symlink_tree (target, source, env):
              ('#scm',       'share/lilypond/%(ver)s/scm'),
              ('#scripts',   'share/lilypond/%(ver)s/scripts'),
              ('#ps',        'share/lilypond/%(ver)s/ps'),
-             ('po/@/nl.mo', 'share/locale/nl/lc_messages/lilypond.mo'),
+             ('po/@/nl.mo', 'share/locale/nl/LC_MESSAGES/lilypond.mo'),
              ('elisp',      'share/lilypond/%(ver)s/elisp')))
 
-       print "fixme: barf barf barf"
+       print "FIXME: BARF BARF BARF"
        os.chdir (absbuild)
        out = env['out']
        ver = version
@@ -858,11 +862,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'],
-                    [symlink_tree, 'touch $target'])
-       env.depends ('lily', stamp)
+       env.Command (stamp, ['#/SConstruct', '#/VERSION'],
+                    [symlink_tree, 'touch $TARGET'])
+       env.Depends ('lily', stamp)
        
 #### dist, tar
 def plus (a, b):
@@ -911,15 +915,16 @@ else:
        subdirs = string.split (os.popen (command).read ())
 
 if env['fast']\
-   and 'all' not in command_line_targets\
-   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 'all' not in COMMAND_LINE_TARGETS\
+   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',
+                  'flower',
                   'kpath-guile',
                   'mf',
+                  'python',
                   ]
 
 if os.path.isdir ('%(srcdir)s/CVS' % vars ()):