summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-03-02 17:24:04 +0000
committerbapt <bapt@FreeBSD.org>2015-03-02 17:24:04 +0000
commit4bf7df989ef18b4641621b174167c5f32d80770b (patch)
treef4519165f6d3a5b29a862800d93b2f1a62e40ad3
parent16e0d32606b992822b1daf6dece064edf6517305 (diff)
downloadFreeBSD-src-4bf7df989ef18b4641621b174167c5f32d80770b.zip
FreeBSD-src-4bf7df989ef18b4641621b174167c5f32d80770b.tar.gz
Install manpage version of texinfo documentation for binutils
-rw-r--r--ObsoleteFiles.inc4
-rw-r--r--etc/mtree/BSD.usr.dist2
-rw-r--r--gnu/usr.bin/binutils/doc/Makefile9
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc6
4 files changed, 12 insertions, 9 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 762ce27..1678bd0 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,10 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150302: binutils documentation distributed as a manpage
+OLD_FILES+=usr/share/doc/binutils/as.txt
+OLD_FILES+=usr/share/doc/binutils/ld.txt
+OLD_DIRS+=usr/share/doc/binutils
# 20150222: Removed bcd(6) and ppt(6)
OLD_FILES+=usr/bin/bcd
OLD_FILES+=usr/bin/ppt
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index f028e46..aeb57cf 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -181,8 +181,6 @@
..
atm
..
- binutils
- ..
legal
intel_ipw
..
diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index 897ddd4..ba17ab9 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -2,11 +2,10 @@
.include "../Makefile.inc0"
-.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld
+.PATH: ${SRCDIR}/gas/doc \
+ ${SRCDIR}/ld \
+ ${SRCDIR}/binutils/doc
-FILESGROUPS= TOP
-
-TOPDIR= ${SHAREDIR}/doc/binutils
-TOP= as.txt ld.txt
+MAN= ld.7 ldint.7 as.7 binutils.7
.include <bsd.prog.mk>
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 61369b5..455d9bd 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -200,13 +200,15 @@ OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsc
OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw
OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
-OLD_FILES+=usr/share/doc/binutils/as.txt
-OLD_FILES+=usr/share/doc/binutils/ld.txt
OLD_FILES+=usr/share/man/man1/as.1.gz
OLD_FILES+=usr/share/man/man1/ld.1.gz
OLD_FILES+=usr/share/man/man1/objcopy.1.gz
OLD_FILES+=usr/share/man/man1/objdump.1.gz
OLD_FILES+=usr/share/man/man1/readelf.1.gz
+OLD_FILES+=usr/share/man/man7/as.7.gz
+OLD_FILES+=usr/share/man/man7/ld.7.gz
+OLD_FILES+=usr/share/man/man7/ldint.7.gz
+OLD_FILES+=usr/share/man/man7/binutils.7.gz
.endif
.if ${MK_BLUETOOTH} == no
OpenPOWER on IntegriCloud