This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[1.1] fixes for g77 dvi target


`make f/g77.dvi' currently doesn't work at all, per a report to
bug-gcc inter alia.  The invocation of texi2dvi is wrong (though
there's a -I arg in the development version) and a Texinfo bug gives a
TeX error anyhow.  I'll take out the kluge for the TeX error in favour
of something else when there's an official fix for texinfo.tex, but
this will get it working for the release.

Craig agrees with this on both branches.  Is that OK?

1998-07-30  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.

Index: Make-lang.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/f/Make-lang.in,v
retrieving revision 1.40.2.1
diff -u -p -r1.40.2.1 Make-lang.in
--- Make-lang.in	1998/07/15 09:55:09	1.40.2.1
+++ Make-lang.in	1998/08/03 09:59:43
@@ -257,8 +257,15 @@ f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir
 	  *[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:
Index: g77install.texi
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/f/g77install.texi,v
retrieving revision 1.6.2.1
diff -u -p -r1.6.2.1 g77install.texi
--- g77install.texi	1998/07/15 09:55:12	1.6.2.1
+++ g77install.texi	1998/08/03 09:59:47
@@ -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 o
 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.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]