From 1b07e854d9ae5bb5707ed2a2d3bf86da5153be00 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sun, 20 May 2001 14:50:44 +0100 Subject: [PATCH] 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 --- gcc/ch/ChangeLog | 7 +++++++ gcc/ch/Make-lang.in | 9 +++------ gcc/f/ChangeLog | 4 ++++ gcc/f/Make-lang.in | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog index 315713d3ebe..912bca31862 100644 --- a/gcc/ch/ChangeLog +++ b/gcc/ch/ChangeLog @@ -1,3 +1,10 @@ +2001-05-20 Joseph S. Myers + + * 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 * 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 54751289794..156a742af3b 100644 --- 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 # # Install hooks: # cc1chill is installed elsewhere as part of $(COMPILERS). diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 0aeb1a1fc23..394f1a680a7 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,7 @@ +2001-05-20 Joseph S. Myers + + * Make-lang.in (f/g77.dvi): Include $(srcdir) in TEXINPUTS. + 2001-05-19 Toon Moene * Make-lang.in: Have $(MAKEINFO) look into the parent diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in index 5a48def1c2a..bef2e20bacd 100644 --- 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 -- 2.30.2