patch::: 1.3.119.jcn3

1.3.119.jcn3
============

* Removed texi->dvi cancellation and removed --clean option from texi2dvi
command line; this fixes generation of dvi files in Documentation/user.
Strange bug in texi2dvi.

---
Generated by janneke@gnu.org,
From = lilypond-1.3.119.jcn2, To = lilypond-1.3.119.jcn3

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.119.jcn3.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 086482e6ab103ce9fa6a9b8542700d3d7a580f3d..34ecc27feaa7ffc205dd06ac5b94878c3c6c1d5e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,16 @@
---- ../lilypond-1.3.119.jcn1/CHANGES   Wed Dec 27 22:12:36 2000
+--- ../lilypond-1.3.119.jcn2/CHANGES   Tue Jan  2 12:29:36 2001
+++ b/CHANGES   Wed Jan  3 13:54:49 2001
+@@ -1,3 +1,10 @@
+1.3.119.jcn3
+============
+
+* Removed texi->dvi cancellation and removed --clean option from texi2dvi
+command line; this fixes generation of dvi files in Documentation/user.
+Strange bug in texi2dvi.
+
+ 1.3.119.jcn2
+ ============
+ --- ../lilypond-1.3.119.jcn1/CHANGES  Wed Dec 27 22:12:36 2000
 ++ b/CHANGES   Tue Jan  2 12:29:36 2001
 @@ -1,3 +1,14 @@
 1.3.119.jcn2

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 6bf16c2d01d17154216881cbd36f1f52169d309a..d8d035834e74c555c8e2e22da39f17a726957ec5 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -34,8 +34,6 @@ ps: $(PS_FILES)
 # `.nexi', making sure we don't run LilyPond for inline pictures, when
 # generating info.
 $(outdir)/%.info: $(outdir)/%.texi
-# Cancel default dvi rule, we use lilypond-book.
-$(outdir)/%.dvi: $(outdir)/%.texi
 
 default: 
 

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

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 0356e3629606091ab3192f8825cf11e7cba33e53..452f736b1fe231ee38db82c141e67d25119adc2f 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -17,7 +17,9 @@ $(outdir)/%/%.html: $(outdir)/%.texi
        $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
 
 $(outdir)/%.dvi: $(outdir)/%.texi
-       cd $(outdir); texi2dvi --batch --clean ../$< 
+# ugh, --clean removes .. from TEXINPUTS?
+#      cd $(outdir); texi2dvi --batch --clean ../$< 
+       cd $(outdir); texi2dvi --batch ../$< 
 
 $(outdir)/%.txt: $(outdir)/%.texi
        $(MAKEINFO) -I../ -I $(outdir) --no-split --no-headers --output $@ $<

diff --git a/stepmake/stepmake/texinfo-rules.make.orig b/stepmake/stepmake/texinfo-rules.make.orig
index e24d66435a36b6768e59fc617645c0b8dcfe4dbc..0356e3629606091ab3192f8825cf11e7cba33e53 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make.orig
+++ b/stepmake/stepmake/texinfo-rules.make.orig
@@ -16,10 +16,8 @@ $(outdir)/%/%.html: $(outdir)/%.texi
 # we want footers even if website builds (or is built) partly
        $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
 
-$(outdir)/%.dvi:       $(outdir)/%.texi
-# --clean only in >= 3.12s
-# cd $(outdir); texi2dvi --clean ../$< 
-       cd $(outdir); texi2dvi ../$< 
+$(outdir)/%.dvi: $(outdir)/%.texi
+       cd $(outdir); texi2dvi --batch --clean ../$< 
 
 $(outdir)/%.txt: $(outdir)/%.texi
        $(MAKEINFO) -I../ -I $(outdir) --no-split --no-headers --output $@ $<