Build and install gasp's infodocs along side the other binutil docs rather

than seperately.

Pointed out by:	bde

3 files changed, 2 insertions, 19 deletions

diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index 0669e36..b6e02e0 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -7,9 +7,10 @@ CONTRIBDIR= ${.CURDIR}/../../../../contrib
 
 .PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc ${GDBDIR}/gdb/doc
 
-INFO = as ld annotate gdb gdbint stabs
+INFO = as ld annotate gasp gdb gdbint stabs
 INFOSECTION=	"Programming & development tools."
 INFOENTRY_as=	"* As: (as).            The GNU assembler."
+INFOENTRY_gasp=	"* Gasp: (gasp).        The GNU Assembler Macro Preprocessor."
 INFOENTRY_ld=	"* Ld: (ld).		The GNU linker."
 INFOENTRY_annotate= "* GDB annotation: (annotate).	Annotations for the GNU Debugger (GDB)."
 
diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile
index a272155..96e3576 100644
--- a/gnu/usr.bin/binutils/gasp/Makefile
+++ b/gnu/usr.bin/binutils/gasp/Makefile
@@ -6,8 +6,6 @@
 
 .PATH: ${SRCDIR}/gas
 
-SUBDIR=		doc
-
 PROG=		gasp
 SRCS+=		gasp.c macro.c sb.c hash.c
 CFLAGS+=	-I${SRCDIR}
diff --git a/gnu/usr.bin/binutils/gasp/doc/Makefile b/gnu/usr.bin/binutils/gasp/doc/Makefile
deleted file mode 100644
index 093d78c..0000000
--- a/gnu/usr.bin/binutils/gasp/doc/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include "../../Makefile.inc0"
-
-RELTOP:= ../..
-
-.PATH: ${SRCDIR}/gas/doc
-
-INFO=	gasp
-
-INFOSECTION=	"GASP Documentation"
-INFOENTRY= 	"* gasp: (gasp).		The GNU Assembler Macro Preprocessor."
-
-MAKEINFOFLAGS+= -I ${SRCDIR}/gas/doc
-
-.include <bsd.info.mk>