*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 9fe008e67c590a7e68b29b91dc3a7e1873329f49..c65e6877ff68a139c76ec3328fb2be461ed48db2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2004-07-09  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * buildscripts/builder.py:
-       * Documentation/SConscript (outdir): New file.
+       
+       * Documentation/SConscript (outdir): New file.  Add *list.ly
+       dependencies.  Fixes PDF doc build.
 
 2004-07-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 

diff --git a/Documentation/SConscript b/Documentation/SConscript
index ce873d728bc813ff21747b2fa5dfa68d40238a1a..d2aad2c257e4ad7f9321e7c83d790e11c8560130 100644 (file)
--- a/Documentation/SConscript
+++ b/Documentation/SConscript
@@ -27,15 +27,12 @@ def verbose_opt (env, opt):
 LILYPOND_BIN = env['LILYPOND_BIN']
 LILYPONDPREFIX = env['LILYPONDPREFIX']
 
-# $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(builddir)/lily/$(outconfbase)/lilypond-bin
-#      cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond-bin --verbose $(abs-srcdir)/ly/generate-documentation
-#      rm -f $(outdir)/lilypond-internals.nexi
-#      -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 
-e.Depends ('lilypond.texi', 'feta16list.ly')
-e.Depends ('lilypond.texi', 'parmesan16list.ly')
+mfbuild = os.path.join (env['absbuild'], 'mf', env['out'])
+e.Depends ('user/lilypond.texi', os.path.join (mfbuild, 'feta16list.ly'))
+e.Depends ('user/lilypond.texi', os.path.join (mfbuild, 'parmesan16list.ly'))
 e.Depends ('lilypond.texi', 'lilypond-internals.texi')
-                        
+
 e.Command ('lilypond-internals.texi', LILYPOND_BIN,
           ('(cd $$(dirname $TARGET) && \
           LILYPONDPREFIX=%(LILYPONDPREFIX)s %(LILYPOND_BIN)s ' \

diff --git a/SConstruct b/SConstruct
index 5b1286f8e1f9bea2435f1bbe6bdd9401a64ba06a..12d07fcf16ac2e9bf9bcffad14f66fcf1599a219 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -313,6 +313,7 @@ if build == '.':
        absbuild = os.getcwd ()
 else:
        absbuild = build
+env['absbuild'] = absbuild
 
 # duh
 env['MAKEINFO'] = 'LANG= makeinfo'