This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch to fix "make dvi"
- To: <gcc-patches at gcc dot gnu dot org>
- Subject: Patch to fix "make dvi"
- From: "Joseph S. Myers" <jsm28 at cam dot ac dot uk>
- Date: Sun, 20 May 2001 14:52:31 +0100 (BST)
The recent change to use the FDL for the g77 manual broke "make dvi"
again. The following patch fixes this, and the longstanding problem
of "make dvi" being broken for CHILL. Tested with "make dvi" with all
languages enabled. Installed on mainline, and the Fortran part on the
branch, as obvious.
PR other/1018 was against 2.95; the Chill part could reasonably be
backported to the 2.95 branch.
ch:
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.
f:
2001-05-20 Joseph S. Myers <jsm28@cam.ac.uk>
* Make-lang.in (f/g77.dvi): Include $(srcdir) in TEXINPUTS.
diff -ruN gcc.orig/ch/Make-lang.in gcc/ch/Make-lang.in
--- gcc.orig/ch/Make-lang.in Fri Feb 16 08:01:19 2001
+++ gcc/ch/Make-lang.in Sun May 20 13:33:26 2001
@@ -113,13 +113,10 @@
$(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
#
# Install hooks:
# cc1chill is installed elsewhere as part of $(COMPILERS).
diff -ruN gcc.orig/f/Make-lang.in gcc/f/Make-lang.in
--- gcc.orig/f/Make-lang.in Sat May 19 20:22:02 2001
+++ gcc/f/Make-lang.in Sun May 20 13:26:08 2001
@@ -195,9 +195,9 @@
# 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
--
Joseph S. Myers
jsm28@cam.ac.uk