Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 9e7c40b1034e86f96d75b518ae791e7633fe1164..3f6f15007bba70081929d93b91e50c9d63a9d16e 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -249,7 +249,7 @@ 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)
+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)
@@ -354,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')
@@ -658,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',
@@ -667,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'],
@@ -826,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'),