From 1249d521fb37a97d9e84fbb27a8b1408bae2a4b8 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 3 Jan 2001 13:54:49 +0100
Subject: [PATCH] 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
---
 CHANGES                                   | 14 +++++++++++++-
 Documentation/user/GNUmakefile            |  2 --
 VERSION                                   |  2 +-
 stepmake/stepmake/texinfo-rules.make      |  4 +++-
 stepmake/stepmake/texinfo-rules.make.orig |  6 ++----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 086482e6ab..34ecc27fea 100644
--- 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 6bf16c2d01..d8d035834e 100644
--- 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 2b9728f50c..eefc891245 100644
--- 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 0356e36296..452f736b1f 100644
--- 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 e24d66435a..0356e36296 100644
--- 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 $@ $<
-- 
2.39.2