patch::: 1.3.103.jcn5

1.3.103.jcn5
============

* Documentation build fix: don't run LilyPond when generating plain info doc.

---
Generated by janneke@gnu.org,
From = lilypond-1.3.103.jcn4, To = lilypond-1.3.103.jcn5

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.103.jcn5.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index ca75e6764170fee34f01e4f7cebf26faa8fa3f65..244f769b7e8e8136f287aab866e3a6d97004ceae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
---- ../lilypond-1.3.103.jcn2/CHANGES   Fri Nov  3 14:39:30 2000
+--- ../lilypond-1.3.103.jcn4/CHANGES   Sun Nov  5 21:15:23 2000
+++ b/CHANGES   Sun Nov  5 23:03:35 2000
+@@ -1,3 +1,8 @@
+1.3.103.jcn5
+============
+
+* Documentation build fix: don't run LilyPond when generating plain info doc.
+
+ 1.3.103.jcn4
+ ============
+ --- ../lilypond-1.3.103.jcn2/CHANGES  Fri Nov  3 14:39:30 2000
 ++ b/CHANGES   Sat Nov  4 15:09:38 2000
 @@ -1,3 +1,12 @@
 1.3.103.jcn3

diff --git a/VERSION b/VERSION
index 3c24a1199064a66782e070c1e4b28662555aed58..abdabb66bab55c17c1c339067545356b83a63dcc 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=103
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn5
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/make/mudela-rules.make b/make/mudela-rules.make
index 9143c6bf45377bf247c8c2478125509077c67c9d..9e0e47e6ceec563e73526d5a2c0cdcf9c125a9a9 100644 (file)
--- a/make/mudela-rules.make
+++ b/make/mudela-rules.make
@@ -11,3 +11,13 @@ $(outdir)/%.latex: %.doc
 $(outdir)/%.texi: %.tely
        cd $(outdir); LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(depth)/../scripts/mudela-book.py -I .. -I $(depth)/../input/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi ../$<
        $(SUBST_TEXI_DEPS)
+
+# nexi: no-lily texi
+# for plain info doco: don't run lily
+$(outdir)/%.nexi: %.tely
+       cd $(outdir); LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(depth)/../scripts/mudela-book.py --no-lily -I .. -I $(depth)/../input/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi ../$<
+       mv $(@D)/$(*F).texi $@
+       $(SUBST_TEXI_DEPS)
+
+$(outdir)/%.info: $(outdir)/%.nexi
+       -$(MAKEINFO) --force --output=$@ $<