From 13aa0cfc8af461fff5bf7ed7a59a1c9e2b61d918 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 21 Jun 2004 18:09:20 +0000
Subject: [PATCH] Disable building of GDB info files until the gdb6 upgrade is
 finished.

---
 gnu/usr.bin/binutils/Makefile     | 3 ++-
 gnu/usr.bin/binutils/doc/Makefile | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index a055db279de..70682e7fbb7 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -4,11 +4,12 @@ SUBDIR=		libiberty libbfd libopcodes libbinutils \
 		addr2line ar as ld nm objcopy objdump ranlib readelf \
 		size strings strip doc
 
+NO_GDB=	yes
 TARGET_ARCH?=	${MACHINE_ARCH}
 .if (${TARGET_ARCH} == "alpha" \
   || ${TARGET_ARCH} == "i386" ) \
     && !defined(NO_GDB)
-#SUBDIR+=	gdb gdbreplay
+SUBDIR+=	gdb gdbreplay
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index da0a662bd0f..20fc2770439 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_GDB=	yes
+
 .include "../Makefile.inc0"
 
 GDBDIR=	${.CURDIR}/../../../../contrib/gdb
@@ -7,7 +9,10 @@ CONTRIBDIR= ${.CURDIR}/../../../../contrib
 
 .PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc ${GDBDIR}/gdb/doc ${GDBDIR}/gdb/mi
 
-INFO = as ld gasp gdb gdbint stabs binutils
+INFO=	as ld gasp stabs binutils
+.if !defined(NO_GDB)
+INFO+=	gdb gdbint
+.endif
 INFOSECTION=	"Programming & development tools."
 INFOENTRY_as=	"* As: (as).            The GNU assembler."
 INFOENTRY_gasp=	"* Gasp: (gasp).        The GNU Assembler Macro Preprocessor."