Use texi2dvi instead of TEX/TEXINDEX.

1 files changed, 12 insertions, 29 deletions

diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index 05ec2f40718..7894d72a072 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -1,4 +1,4 @@
-##Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000
+##Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2002
 ##Free Software Foundation, Inc.
 
 # Makefile for GDB documentation.
@@ -53,6 +53,9 @@ MAKEHTMLFLAGS = -menu -split_chapter
 # where to find texi2roff, ditto
 TEXI2ROFF=texi2roff
 
+# where to find texi2dvi, ditto
+TEXI2DVI=texi2dvi
+
 # Where is the source dir for the READLINE library doc?  
 # Traditionally readline is in .. or .
 READLINE_DIR = ${gdbdir}/../readline/doc
@@ -90,15 +93,9 @@ REFEDITS =
 # Don Knuth's TeX formatter
 TEX = tex
 
-# auxiliary program for sorting Texinfo indices
-TEXINDEX = texindex
-
 # Program to generate Postscript files from DVI files.
 DVIPS = dvips
 
-# Program to generate PDF files from tex files.
-PDFTEX = pdftex
-
 # Main GDB manual's source files
 SFILES_INCLUDED = gdb-cfg.texi $(srcdir)/annotate.texi $(srcdir)/fdl.texi
 
@@ -246,10 +243,7 @@ gdb.dvi: ${SFILES_DOC}
 		(test "$$LN_S" = "ln -s" && ln -s $(srcdir)/GDBvn.texi .) || \
 		ln $(srcdir)/GDBvn.texi . || \
 		cp $(srcdir)/GDBvn.texi . ; else true; fi
-	$(SET_TEXINPUTS) $(TEX) gdb.texinfo
-	$(SET_TEXINPUTS) $(TEX) gdb.texinfo
-	$(TEXINDEX) gdb.??
-	$(SET_TEXINPUTS) $(TEX) gdb.texinfo
+	$(SET_TEXINPUTS) $(TEXI2DVI) $(srcdir)/gdb.texinfo
 	rm -f gdb.aux gdb.cp* gdb.fn* gdb.ky* gdb.log gdb.pg* gdb.toc \
 		gdb.tp* gdb.vr*
 
@@ -261,10 +255,7 @@ gdb.pdf: ${SFILES_DOC}
 		(test "$$LN_S" = "ln -s" && ln -s $(srcdir)/GDBvn.texi .) || \
 		ln $(srcdir)/GDBvn.texi . || \
 		cp $(srcdir)/GDBvn.texi . ; else true; fi
-	$(SET_TEXINPUTS) $(PDFTEX) gdb.texinfo
-	$(SET_TEXINPUTS) $(PDFTEX) gdb.texinfo
-	$(TEXINDEX) gdb.??
-	$(SET_TEXINPUTS) $(PDFTEX) gdb.texinfo
+	$(SET_TEXINPUTS) $(TEXI2DVI) --pdf $(srcdir)/gdb.texinfo
 	rm -f gdb.aux gdb.cp* gdb.fn* gdb.ky* gdb.log gdb.pg* gdb.toc \
 		gdb.tp* gdb.vr*
 
@@ -371,20 +362,16 @@ gdb_toc.html: ${SFILES_DOC}
 	$(MAKEHTML) $(MAKEHTMLFLAGS) -I ${READLINE_DIR} -I ${GDBMI_DIR} -I $(srcdir) $(srcdir)/gdb.texinfo
 
 # GDB INTERNALS MANUAL: TeX dvi file
-gdbint.dvi : gdbint.texinfo
-	$(SET_TEXINPUTS) $(TEX) gdbint.texinfo
-	$(TEXINDEX) gdbint.??
-	$(SET_TEXINPUTS) $(TEX) gdbint.texinfo
+gdbint.dvi: gdbint.texinfo gdb-cfg.texi
+	$(SET_TEXINPUTS) $(TEXI2DVI) $(srcdir)/gdbint.texinfo
 	rm -f gdbint.aux gdbint.cp* gdbint.fn* gdbint.ky* \
 		gdbint.log gdbint.pg* gdbint.toc gdbint.tp* gdbint.vr*
 
 gdbint.ps : gdbint.dvi
 	$(DVIPS) -o $@ $?
 
-gdbint.pdf: gdbint.dvi
-	$(SET_TEXINPUTS) $(PDFTEX) gdbint.texinfo
-	$(TEXINDEX) gdbint.??
-	$(SET_TEXINPUTS) $(PDFTEX) gdbint.texinfo
+gdbint.pdf: gdbint.dvi gdb-cfg.texi
+	$(SET_TEXINPUTS) $(TEXI2DVI) --pdf $(srcdir)/gdbint.texinfo
 	rm -f gdbint.aux gdbint.cp* gdbint.fn* gdbint.ky* \
 		gdbint.log gdbint.pg* gdbint.toc gdbint.tp* gdbint.vr*
 
@@ -408,9 +395,7 @@ stabs_toc.html: stabs.texinfo
 
 # STABS DOCUMENTATION: TeX dvi file
 stabs.dvi : stabs.texinfo
-	$(SET_TEXINPUTS) $(TEX) stabs.texinfo
-	$(TEXINDEX) stabs.??
-	$(SET_TEXINPUTS) $(TEX) stabs.texinfo
+	$(SET_TEXINPUTS) $(TEXI2DVI) $(srcdir)/stabs.texinfo
 	rm -f stabs.aux stabs.cp* stabs.fn* stabs.ky* \
 		stabs.log stabs.pg* stabs.toc stabs.tp* stabs.vr*
 
@@ -418,9 +403,7 @@ stabs.ps: stabs.dvi
 	$(DVIPS) -o $@ $?
 
 stabs.pdf: stabs.dvi
-	$(SET_TEXINPUTS) $(PDFTEX) stabs.texinfo
-	$(TEXINDEX) stabs.??
-	$(SET_TEXINPUTS) $(PDFTEX) stabs.texinfo
+	$(SET_TEXINPUTS) $(TEXI2DVI) --pdf $(srcdir)/stabs.texinfo
 	rm -f stabs.aux stabs.cp* stabs.fn* stabs.ky* \
 		stabs.log stabs.pg* stabs.toc stabs.tp* stabs.vr*