From: janneke <janneke>
Date: Fri, 9 Jul 2004 10:13:27 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.3.9^2~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=732bc75074907e12648c9b7b66b6ab24ce0c0649;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 9fe008e67c..c65e6877ff 100644
--- 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 ce873d728b..d2aad2c257 100644
--- 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 5b1286f8e1..12d07fcf16 100644
--- a/SConstruct
+++ b/SConstruct
@@ -313,6 +313,7 @@ if build == '.':
 	absbuild = os.getcwd ()
 else:
 	absbuild = build
+env['absbuild'] = absbuild
 
 # duh
 env['MAKEINFO'] = 'LANG= makeinfo'