3 files changed, 17 insertions, 115 deletions

diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index 38c1b8b33ab78..ba17ab997ae30 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -2,30 +2,10 @@
 
 .include "../Makefile.inc0"
 
-.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc
+.PATH: ${SRCDIR}/gas/doc \
+	${SRCDIR}/ld \
+	${SRCDIR}/binutils/doc
 
-INFO=	as ld binutils
-INFOSECTION=	"Programming & development tools."
-INFOENTRY_as=	"* As: (as).            The GNU assembler."
-INFOENTRY_ld=	"* Ld: (ld).		The GNU linker."
-INFOENTRY_binutils= "* Binutils: (binutils).		The GNU Binary Utilities."
+MAN=	ld.7 ldint.7 as.7 binutils.7
 
-MAKEINFOFLAGS+= --no-validate
-MAKEINFOFLAGS+= -I ${SRCDIR}/libiberty
-MAKEINFOFLAGS+= -I ${SRCDIR}/bfd/doc
-
-CLEANFILES=	bfdver.texi configdoc.texi config.texi gasver.texi ldver.texi
-
-as.info:	as.texinfo asconfig.texi bfdver.texi c-i386.texi gasver.texi
-ld.info:	ld.texinfo bfdsumm.texi ldver.texi configdoc.texi
-
-configdoc.texi: gen-doc.texi
-	ln -sf ${.ALLSRC} ${.TARGET}
-
-.PATH: ${SRCDIR}/binutils/doc
-binutils.info: binutils.texi config.texi
-
-bfdver.texi config.texi gasver.texi ldver.texi:
-	echo "@set VERSION ${VERSION}" > ${.TARGET}
-
-.include <bsd.info.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/doc/Makefile.depend b/gnu/usr.bin/binutils/doc/Makefile.depend
new file mode 100644
index 0000000000000..57b7e10c3d713
--- /dev/null
+++ b/gnu/usr.bin/binutils/doc/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/gnu/usr.bin/binutils/doc/asconfig.texi b/gnu/usr.bin/binutils/doc/asconfig.texi
deleted file mode 100644
index f3fcf349faf31..0000000000000
--- a/gnu/usr.bin/binutils/doc/asconfig.texi
+++ /dev/null
@@ -1,90 +0,0 @@
-@c $FreeBSD$
-@c Copyright 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, 2002,
-@c 2003, 2005
-@c Free Software Foundation, Inc.
-@c This file is part of the documentation for the GAS manual
-
-@c Configuration settings for all-inclusive version of manual
-
-@c switches:------------------------------------------------------------
-@c Properties of the manual
-@c ========================
-@c Discuss all architectures?
-@clear ALL-ARCH
-@c A generic form of manual (not tailored to specific target)?
-@clear GENERIC
-@c Include text on assembler internals?
-@set INTERNALS
-@c Many object formats supported in this config?
-@clear MULTI-OBJ
-
-@c Object formats of interest
-@c ==========================
-@clear AOUT
-@clear COFF
-@set ELF
-@clear SOM
-
-@c CPUs of interest
-@c ================
-@clear ALPHA
-@clear ARC
-@set ARM
-@clear BFIN
-@clear CRIS
-@clear D10V
-@clear D30V
-@clear H8/300
-@clear HPPA
-@clear I370
-@set I80386
-@clear I860
-@clear I960
-@set IA64
-@clear IP2K
-@clear M32C
-@clear M32R
-@clear xc16x
-@clear M68HC11
-@clear M680X0
-@clear MCORE
-@set MIPS
-@clear MMIX
-@clear MS1
-@clear MSP430
-@clear PDP11
-@clear PJ
-@set PPC
-@clear SH
-@set SPARC
-@clear TIC54X
-@clear V850
-@clear VAX
-@clear XTENSA
-@clear Z80
-@clear Z8000
-
-@c Does this version of the assembler use the difference-table kludge?
-@clear DIFF-TBL-KLUGE
-
-@c Do all machines described use IEEE floating point?
-@clear IEEEFLOAT
-
-@c Is a word 32 bits, or 16?
-@set W32
-@clear W16
-
-@c Do symbols have different characters than usual?
-@clear SPECIAL-SYMS
-
-@c strings:------------------------------------------------------------
-@c Name of the assembler:
-@set AS as
-@c Name of C compiler:
-@set GCC gcc
-@c Name of linker:
-@set LD ld
-@c Text for target machine (best not used in generic case; but just in case...)
-@set TARGET machine specific
-@c Name of object format NOT SET in generic version
-@set OBJ-NAME ELF