re PR other/567 ("make dvi" fails)

ch:
	* Make-lang.in (chill.dvi): Remove bogus dependencies.  Don't cd
	to ch; include both $(srcdir)/ch and $(srcdir) in TEXINPUTS.
	Don't move chill.dvi after creating it.  Fixes PR other/567 and
	PR other/1018.

f:
	* Make-lang.in (f/g77.dvi): Include $(srcdir) in TEXINPUTS.

From-SVN: r42345

diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog
index 315713d3ebe1a210cb7d33fa0e79cdb3e46adad2..912bca318620372a33fc21eee11f8a6a1d221ac8 100644 (file)
--- a/gcc/ch/ChangeLog
+++ b/gcc/ch/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-20  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+       * Make-lang.in (chill.dvi): Remove bogus dependencies.  Don't cd
+       to ch; include both $(srcdir)/ch and $(srcdir) in TEXINPUTS.
+       Don't move chill.dvi after creating it.  Fixes PR other/567 and
+       PR other/1018.
+
 Fri Feb 23 15:28:39 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
        * decl.c (set_block): Set NAMES and BLOCKS from BLOCK.

diff --git a/gcc/ch/Make-lang.in b/gcc/ch/Make-lang.in
index 5475128979426939c4a4125b2a1b79cc4c100ad4..156a742af3b05eb2e1eea921e423a8662e28efb1 100644 (file)
--- a/gcc/ch/Make-lang.in
+++ b/gcc/ch/Make-lang.in
@@ -113,13 +113,10 @@ CHILL.info: $(srcdir)/ch/chill.info
 $(srcdir)/ch/chill.info: $(srcdir)/ch/chill.texi
        cd $(srcdir)/ch && $(MAKEINFO) -o chill.info chill.texi
 
-chill.dvi: $(srcdir)/ch/chill.texi $(srcdir)/extend.texi $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi $(srcdir)/tm.texi
-       cd ch ; \
-       TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex chill.texi ; \
+chill.dvi: $(srcdir)/ch/chill.texi
+       TEXINPUTS=${texidir}:$(srcdir)/ch:$(srcdir):$$TEXINPUTS tex $(srcdir)/ch/chill.texi ; \
        texindex chill.?? ; \
-       TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex chill.texi
-# FIXME: Not sure languages should do this.
-       cp ch/chill.dvi chill.dvi
+       TEXINPUTS=${texidir}:$(srcdir)/ch:$(srcdir)$$TEXINPUTS tex $(srcdir)/ch/chill.texi
 #\f
 # Install hooks:
 # cc1chill is installed elsewhere as part of $(COMPILERS).

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 0aeb1a1fc235a4d953fec8a82b99802bc2cb65e4..394f1a680a7ae35b22a2a8c2345489e65ab33610 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-20  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+       * Make-lang.in (f/g77.dvi): Include $(srcdir) in TEXINPUTS.
+
 2001-05-19  Toon Moene  <toon@moene.indiv.nluug.nl>
 
        * Make-lang.in: Have $(MAKEINFO) look into the parent

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 5a48def1c2ab7926b43a418022169f70f894a7e0..bef2e20bacdbf79a839017dc7134ab77b4f2a48c 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -195,9 +195,9 @@ f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
 # be universally valid.  `$(TEX)' should be used if it gets defined in
 # gcc/Makefile.in.
        if [ -f lang-f77 ]; then \
-         TEXINPUTS=$(srcdir)/f:$$TEXINPUTS tex $(srcdir)/f/g77.texi; \
+         TEXINPUTS=$(srcdir)/f:$(srcdir):$$TEXINPUTS tex $(srcdir)/f/g77.texi; \
          texindex g77.??; \
-         TEXINPUTS=$(srcdir)/f:$$TEXINPUTS tex $(srcdir)/f/g77.texi; \
+         TEXINPUTS=$(srcdir)/f:$(srcdir):$$TEXINPUTS tex $(srcdir)/f/g77.texi; \
          mv g77.dvi f; \
        else true; fi