# HG changeset patch
# User Jan Nieuwenhuizen <janneke@gnu.org>
# Date 1346097685 -7200
# Node ID fdc0cf703c9db75bed06087b8e531fa3251d5771
# Parent  b4fdb9a2ada37a44dfe4842e95c6a81d43aa27a6
lilypond-doc: Use makeinfo and zip from tools. Relaxes system dependencies.

diff -r b4fdb9a2ada3 -r fdc0cf703c9d README
--- a/README	Mon Aug 27 20:08:05 2012 +0200
+++ b/README	Mon Aug 27 22:01:25 2012 +0200
@@ -492,8 +492,6 @@
 In addition to the requirements for GUB, you need
 
   • A TeX installation
-  • texinfo
-  • zip
 
 Build everything
 
diff -r b4fdb9a2ada3 -r fdc0cf703c9d gub.make
--- a/gub.make	Mon Aug 27 20:08:05 2012 +0200
+++ b/gub.make	Mon Aug 27 22:01:25 2012 +0200
@@ -1,5 +1,5 @@
 CWD:=$(shell pwd)
-PYTHON=python
+PYTHON=$(shell which python)
 PYTHONPATH=.
 export PYTHONPATH
 
diff -r b4fdb9a2ada3 -r fdc0cf703c9d gub/specs/lilypond-doc.py
--- a/gub/specs/lilypond-doc.py	Mon Aug 27 20:08:05 2012 +0200
+++ b/gub/specs/lilypond-doc.py	Mon Aug 27 22:01:25 2012 +0200
@@ -12,8 +12,9 @@
                 'tools::imagemagick',
                 'tools::rsync', # ugh, we depend on *rsync* !?
                 #'tools::texlive',
-                'system::makeinfo',
-                'system::zip',
+                'tools::texinfo',
+                'tools::zip',
+                'system::tex',
                 ])
     make_flags = misc.join_lines ('''
 CROSS=no
diff -r b4fdb9a2ada3 -r fdc0cf703c9d lilypond.make
--- a/lilypond.make	Mon Aug 27 20:08:05 2012 +0200
+++ b/lilypond.make	Mon Aug 27 22:01:25 2012 +0200
@@ -73,7 +73,7 @@
 #FIXME: we cannot use python from tools, because of the gub/logging.py
 #       name clash.  Todo: rename gub/logging.py -- triggers full
 #       rebuild.  Not using tools means: we depend on /usr/bin/makeinfo
-#SET_TOOLS_PATH=PATH=$(CWD)/target/tools/root/usr/bin:$(PATH)
+SET_TOOLS_PATH=PATH=$(CWD)/target/tools/root/usr/bin:$(PATH)
 
 LILYPOND_VERSIONS = versiondb/lilypond.versions
 
diff -r b4fdb9a2ada3 -r fdc0cf703c9d web/lilypond.html
--- a/web/lilypond.html	Mon Aug 27 20:08:05 2012 +0200
+++ b/web/lilypond.html	Mon Aug 27 22:01:25 2012 +0200
@@ -21,8 +21,6 @@
 
 <ul>
     <li>A TeX installation</li>
-    <li>texinfo</li>
-    <li>zip</li>
 </ul>
 
 <h3>Build everything</h3>