Make-lang.in (f/g77.dvi): Replace non-working use of texi2dvi with explicit use of...

1998-08-09  Dave Love  <d.love@dl.ac.uk>
	* Make-lang.in (f/g77.dvi): Replace non-working use of texi2dvi
	with explicit use of tex.
	(f77.mostlyclean): Remove TeX index files.
	* g77install.texi (Prerequisites): Kluge round TeX lossage with
	hyphen in @value in @code.

From-SVN: r21642

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index d9fd6ef121818139cf87dc253ab8be2f2e40668d..4cae109d6f859caa9727d72a13b24d02bfc7f302 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,12 @@
+1998-08-09  Dave Love  <d.love@dl.ac.uk>
+
+       * Make-lang.in (f/g77.dvi): Replace non-working use of texi2dvi
+       with explicit use of tex.
+       (f77.mostlyclean): Remove TeX index files.
+
+       * g77install.texi (Prerequisites): Kluge round TeX lossage with
+       hyphen in @value in @code.
+
 Tue Aug  4 16:59:39 1998  Craig Burley  <burley@gnu.org>
 
        * com.c (ffecom_convert_narrow_, ffecom_convert_widen_):

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index b2d9f06f5a82eab723b768cf8cd6a2ccab7af447..7dd1fcf7c8359a811882820a9f26446fa9edbdba 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -257,8 +257,15 @@ f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
          *[fF]77*) touch lang-f77;; \
          *) rm -f lang-f77;; \
        esac
+# `tex2dvi' was used below, but the Texinfo 3.12 one won't work properly
+# with the include files from $(srcdir).  This use of TEXINPUTS may not
+# be universally valid.  `$(TEX)' should be used if it gets defined in
+# gcc/Makefile.in.
        if [ -f lang-f77 ]; then \
-         $(TEXI2DVI) -I$(srcdir)/f -o f/g77.dvi $(srcdir)/f/g77.texi; \
+         TEXINPUTS=$(srcdir)/f:$$TEXINPUTS tex $(srcdir)/f/g77.texi; \
+         texindex g77.??; \
+         TEXINPUTS=$(srcdir)/f:$$TEXINPUTS tex $(srcdir)/f/g77.texi; \
+         mv g77.dvi f; \
        fi
 
 # This dance is all about producing accurate documentation for g77's
@@ -410,6 +417,8 @@ f77.mostlyclean:
        -rm -f f/*$(objext)
        -rm -f f/fini f/stamp-str f/str-*.h f/str-*.j
        -rm -f f/intdoc f/ansify f/intdoc.h0
+       -rm -f g77.aux g77.cps g77.ky g77.toc g77.vr g77.fn g77.kys \
+              g77.pg g77.tp g77.vrs g77.cp g77.fns g77.log g77.pgs g77.tps 
 f77.clean:
        -rm -f g77.c g77.o g77spec.o g77version.o
 f77.distclean:

diff --git a/gcc/f/g77install.texi b/gcc/f/g77install.texi
index 48c903ac4ecab5c3d98ab34f21c8607d04a60c9e..70411078f83bc1f35f3f648f1c115e4031279462 100644 (file)
--- a/gcc/f/g77install.texi
+++ b/gcc/f/g77install.texi
@@ -18,7 +18,7 @@
 @set version-patch 2.5
 @set version-sed 2.05
 @set version-tar 1.12
-@set version-texinfo 3.11
+@set version-texinfo 3.12
 
 @ifclear INSTALLONLY
 @node Installation
@@ -121,9 +121,19 @@ and use @code{g77} depends on the type of system you're
 using, how you build @code{g77}, and how much of it you
 install (primarily, which languages you install).
 
-The sizes shown below assume all languages distributed
-in @code{gcc-@value{version-gcc}}, plus @code{g77}, will be built
-and installed.
+The sizes shown below assume all languages distributed in
+@c As of `Version 2.249', texinfo.tex loses on a construction like
+@c @code{...@value{...-...}...} since the hyphen is expanded as
+@c -@discretionary{}{}{}, even though @value resets its catcode.
+@c Fortunately this is currently the only instance.  Kluge, kluge.
+@iftex
+@begingroup @let@codedash=@realdash
+@end iftex
+@code{gcc-@value{version-gcc}},
+@iftex
+@endgroup
+@end iftex
+plus @code{g77}, will be built and installed.
 These sizes are indicative of GNU/Linux systems on
 Intel x86 running COFF and on Digital Alpha (AXP) systems
 running ELF.