Mercurial > gub
changeset 6202:fdc0cf703c9d
lilypond-doc: Use makeinfo and zip from tools. Relaxes system dependencies.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Mon, 27 Aug 2012 22:01:25 +0200 |
| parents | b4fdb9a2ada3 |
| children | f60548642152 |
| files | README gub.make gub/specs/lilypond-doc.py lilypond.make web/lilypond.html |
| diffstat | 5 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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
--- 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