* Resurrect `scons lily' build.

	* SConstruct (symlink_tree): Bugfix: link
	music-drawing-routines.ps to file iso directory.

	* lily/SConscript: Remove kpath-guile from LIBS.

	* SConstruct (libdir_package_version): Typo.
	(configure): Comment-out fontforge for lack of fontforge.pc .
	Also add libdir* to environment.

diff --git a/ChangeLog b/ChangeLog
index b34b733241761d4a88a9220ae1ce17a381111656..6b4b010eb79f69d0671f19197530a82cc8bab968 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-30  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * Resurrect `scons lily' build.
+
+       * SConstruct (symlink_tree): Bugfix: link
+       music-drawing-routines.ps to file iso directory.
+
+       * lily/SConscript: Remove kpath-guile from LIBS.
+
+       * SConstruct (libdir_package_version): Typo.
+       (configure): Comment-out fontforge for lack of fontforge.pc .
+       Also add libdir* to environment.
+
 2006-05-30  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/ various: minor additions from mailist and

diff --git a/SConstruct b/SConstruct
index 9e7c40b1034e86f96d75b518ae791e7633fe1164..e113eda225f32f342d2ff7bc00688e5c94fe512c 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',
@@ -826,7 +828,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'),

diff --git a/lily/SConscript b/lily/SConscript
index 46568d4c18c47d81468798609f870cc3f5b96a23..d12e237fd16a0d4bf0cd3bc6055146a3352b892d 100644 (file)
--- a/lily/SConscript
+++ b/lily/SConscript
@@ -17,7 +17,7 @@ e.Append (
          '#/kpath-guile/include',
          outdir],
        LEXFLAGS = ['-Cfe', '-p', '-p'],
-       LIBS = ['flower', 'kpath-guile'],
+       LIBS = ['flower'],
        )
 
 e.HH ('parser.hh', 'parser.yy')