* lily/relocate.cc (read_relocation_dir): Do not blindly

	dereference DIR.

diff --git a/ChangeLog b/ChangeLog
index 6305797133c94d8883e4aff2700bd95622cbf723..03e4593581f662f14fd637b58d50bf11f492e76f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-30  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/relocate.cc (read_relocation_dir): Do not blindly
+       dereference DIR.
+
 2006-05-30  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * lily/parser.yy: replace THIS by PARSER
@@ -52,6 +57,12 @@
 
 2006-05-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * buildscripts/builder.py: Remove --ly option/target from mf-to-table.
+
+       * scripts/lilypond-book.py: Bugfix: do not blindly attempt
+       .../current hack if LILYPONDPREFIX is fine.  Fixes `scons doc'
+       build.
+
        * Resurrect `scons lily' build.
 
        * SConstruct (symlink_tree): Bugfix: link

diff --git a/SConstruct b/SConstruct
index e113eda225f32f342d2ff7bc00688e5c94fe512c..3f6f15007bba70081929d93b91e50c9d63a9d16e 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -669,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'],

diff --git a/buildscripts/builder.py b/buildscripts/builder.py
index b34877d88fa01ccd595064986b30240c156cc0fd..3caea45830dd49d1cf25dbc31cc472d7b806c6b3 100644 (file)
--- a/buildscripts/builder.py
+++ b/buildscripts/builder.py
@@ -205,8 +205,8 @@ a = '$PYTHON $MF_TO_TABLE_PY \
 --lisp=${TARGET.base}.lisp \
 --enc=${TARGET.base}.enc \
 --tex=${TARGET.base}.tex \
---ly=${TARGET.base}list.ly \
 ${TARGET.base}.log'
+#--ly=${TARGET.base}list.ly \
 gtable = Builder (action = a, suffix = '.otf-gtable', src_suffix = '.log',
          emitter = add_lisp_enc_tex_ly_target)
 env.Append (BUILDERS = {'GTABLE': gtable})

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index e288335fbb006fd275bb3e6c931ee7e935e248de..486d21fedb92d2122b40b68f60aa43d1f809fbbc 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -58,9 +58,10 @@ sys.path.insert (0, os.path.join (datadir, 'python'))
 if os.environ.has_key ('LILYPONDPREFIX'):
     datadir = os.environ['LILYPONDPREFIX']
     while datadir[-1] == os.sep:
-        datadir= datadir[:-1]
-        
-    datadir = os.path.join (datadir, "share/lilypond/current/")
+        datadir = datadir[:-1]
+
+    if not os.path.exists (os.path.join (datadir, 'python/lilylib.py')):
+        datadir = os.path.join (datadir, 'share/lilypond/current/')
 sys.path.insert (0, os.path.join (datadir, 'python'))
 
 # dynamic relocation, for GUB binaries.