From 8e887555b59f320af387987381da9f4356bf6125 Mon Sep 17 00:00:00 2001
From: Sheldon Hearn <sheldonh@FreeBSD.org>
Date: Mon, 1 Jul 2002 07:58:18 +0000
Subject: [PATCH] Reconnect gdb info file to the build.

Submitted by:	Szilveszter Adam <sziszi@bsd.hu>
---
 gnu/usr.bin/binutils/doc/Makefile      | 17 ++++++++++++-----
 gnu/usr.bin/binutils/doc/inc-hist.diff |  4 ++--
 gnu/usr.bin/gdb/doc/inc-hist.diff      |  4 ++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index e13e33810edf..a7e8c6531a73 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -5,9 +5,9 @@
 GDBDIR=	${.CURDIR}/../../../../contrib/gdb
 CONTRIBDIR= ${.CURDIR}/../../../../contrib
 
-.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc ${GDBDIR}/gdb/doc
+.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc ${GDBDIR}/gdb/doc ${GDBDIR}/gdb/mi
 
-INFO = as ld annotate gasp stabs binutils
+INFO = as ld annotate gasp gdb gdbint stabs binutils
 INFOSECTION=	"Programming & development tools."
 INFOENTRY_as=	"* As: (as).            The GNU assembler."
 INFOENTRY_gasp=	"* Gasp: (gasp).        The GNU Assembler Macro Preprocessor."
@@ -19,6 +19,7 @@ MAKEINFOFLAGS+= --no-validate
 MAKEINFOFLAGS+= -I ${SRCDIR}/gas/doc -I ${SRCDIR}/ld -I ${SRCDIR}/bfd/doc
 MAKEINFOFLAGS+= -I ${SRCDIR}/binutils
 MAKEINFOFLAGS+= -I ${GDBDIR}/gdb/doc
+MAKEINFOFLAGS+= -I ${GDBDIR}/gdb/mi
 MAKEINFOFLAGS+= -I ${CONTRIBDIR}/libreadline/doc
 
 CLEANFILES=	gdb-cfg.texi inc-hist.texi inc-hist.texi.orig \
@@ -27,12 +28,18 @@ CLEANFILES=	gdb-cfg.texi inc-hist.texi inc-hist.texi.orig \
 as.info:	as.texinfo asconfig.texi c-i386.texi gasver.texi
 ld.info:	ld.texinfo bfdsumm.texi ldver.texi
 
-gdb.info: gdb.texinfo gdb-cfg.texi GDBvn.texi remote.texi \
-	rluser.texinfo inc-hist.texi
+gdb.info: gdb.texinfo gdb-cfg.texi GDBvn.texi annotate.texi \
+	  fdl.texi gpl.texi gdbmi.texinfo \
+	rluser.texinfo inc-hist.texinfo
 
+gdbint.info: gdbint.texinfo fdl.texi
+	
 gdb-cfg.texi: all-cfg.texi
 	ln -sf ${.ALLSRC} ${.TARGET}
 
+GDBvn.texi: ${GDBDIR}/gdb/version.in
+	echo "@set GDBVN `sed q ${.ALLSRC}`" > ${.TARGET}
+
 .PATH: ${SRCDIR}/binutils
 binutils.info: binutils.texi config.texi
 
@@ -40,7 +47,7 @@ gasver.texi ldver.texi:
 	echo "@set VERSION ${VERSION}" > ${.TARGET}
 
 .PATH: ${CONTRIBDIR}/libreadline/doc
-inc-hist.texi: hsuser.texinfo inc-hist.diff
+inc-hist.texinfo: hsuser.texinfo inc-hist.diff
 	cp ${.ALLSRC:M*.texinfo} ${.TARGET}
 	patch -b .orig < ${.ALLSRC:M*.diff}
 
diff --git a/gnu/usr.bin/binutils/doc/inc-hist.diff b/gnu/usr.bin/binutils/doc/inc-hist.diff
index 721db2668169..923f97322641 100644
--- a/gnu/usr.bin/binutils/doc/inc-hist.diff
+++ b/gnu/usr.bin/binutils/doc/inc-hist.diff
@@ -1,7 +1,7 @@
 $FreeBSD$
 
---- inc-hist.texi.orig	Wed Apr 11 08:20:01 2001
-+++ inc-hist.texi	Wed Apr 11 08:21:57 2001
+--- inc-hist.texinfo.orig	Wed Apr 11 08:20:01 2001
++++ inc-hist.texinfo	Wed Apr 11 08:21:57 2001
 @@ -26,9 +26,9 @@
  @node Using History Interactively
  @chapter Using History Interactively
diff --git a/gnu/usr.bin/gdb/doc/inc-hist.diff b/gnu/usr.bin/gdb/doc/inc-hist.diff
index 721db2668169..923f97322641 100644
--- a/gnu/usr.bin/gdb/doc/inc-hist.diff
+++ b/gnu/usr.bin/gdb/doc/inc-hist.diff
@@ -1,7 +1,7 @@
 $FreeBSD$
 
---- inc-hist.texi.orig	Wed Apr 11 08:20:01 2001
-+++ inc-hist.texi	Wed Apr 11 08:21:57 2001
+--- inc-hist.texinfo.orig	Wed Apr 11 08:20:01 2001
++++ inc-hist.texinfo	Wed Apr 11 08:21:57 2001
 @@ -26,9 +26,9 @@
  @node Using History Interactively
  @chapter Using History Interactively