9 files changed, 27 insertions, 32 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 1828449..0c37471 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14,6 +14,9 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd
+OLD_FILES+=usr/share/doc/papers/bc.ascii.gz
+OLD_FILES+=usr/share/doc/papers/dc.ascii.gz
 # 20100120: replacing GNU bc/dc with BSDL versions
 OLD_FILES+=usr/share/examples/bc/ckbook.b
 OLD_FILES+=usr/share/examples/bc/pi.b
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index a0c18f2..8ccca1a 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -160,6 +160,10 @@
             usd
                 04.csh
                 ..
+                05.dc
+                ..
+                06.bc
+                ..
                 07.mail
                 ..
                 10.exref
diff --git a/share/doc/usd/05.dc/Makefile b/share/doc/usd/05.dc/Makefile
new file mode 100644
index 0000000..2b01e0c
--- /dev/null
+++ b/share/doc/usd/05.dc/Makefile
@@ -0,0 +1,9 @@
+#	@(#)Makefile	8.1 (Berkeley) 6/8/93
+# $FreeBSD$
+
+VOLUME=	usd/05.dc
+SRCS=	dc
+MACROS=	-ms
+SRCDIR=	${.CURDIR}/../../../../usr.bin/dc/USD.doc
+
+.include <bsd.doc.mk>
diff --git a/share/doc/usd/06.bc/Makefile b/share/doc/usd/06.bc/Makefile
new file mode 100644
index 0000000..12dfedd
--- /dev/null
+++ b/share/doc/usd/06.bc/Makefile
@@ -0,0 +1,9 @@
+#	@(#)Makefile	8.1 (Berkeley) 6/8/93
+# $FreeBSD$
+
+VOLUME=	usd/06.bc
+SRCS=	bc
+MACROS=	-ms
+SRCDIR=	${.CURDIR}/../../../../usr.bin/bc/USD.doc
+
+.include <bsd.doc.mk>
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index e7939fe..5fcb6b3 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -7,6 +7,8 @@
 SUBDIR=	title \
 	contents \
 	04.csh \
+	05.dc \
+	06.bc \
 	07.mail \
 	10.exref \
 	11.vitut \
diff --git a/usr.bin/bc/Makefile b/usr.bin/bc/Makefile
index 6a1614b..d5b75f8 100644
--- a/usr.bin/bc/Makefile
+++ b/usr.bin/bc/Makefile
@@ -4,7 +4,6 @@
 PROG=		bc
 SRCS=		bc.y scan.l
 CFLAGS+=	-I. -I${.CURDIR}
-SUBDIR+=	USD.doc
 
 FILES+=		bc.library
 FILESDIR=	${SHAREDIR}/misc
diff --git a/usr.bin/bc/USD.doc/Makefile b/usr.bin/bc/USD.doc/Makefile
deleted file mode 100644
index 44265d2..0000000
--- a/usr.bin/bc/USD.doc/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$FreeBSD$
-#	$OpenBSD: Makefile,v 1.3 2004/02/01 15:18:01 jmc Exp $
-
-DOC=	bc
-DIR=	usd/06.bc
-SRCS=	bc
-MACROS=	-ms
-BINDIR=	/usr/share/doc/papers
-
-paper.txt: ${SRCS}
-	${ROFF} -Tascii ${SRCS} > ${.TARGET}
-
-.include <bsd.doc.mk>
diff --git a/usr.bin/dc/Makefile b/usr.bin/dc/Makefile
index 6e16d85..38aeca6 100644
--- a/usr.bin/dc/Makefile
+++ b/usr.bin/dc/Makefile
@@ -6,6 +6,4 @@ SRCS=	dc.c bcode.c inout.c mem.c stack.c
 LDADD=	-lcrypto
 DPADD=	${LIBCRYPTO}
 
-SUBDIR+=	USD.doc
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/dc/USD.doc/Makefile b/usr.bin/dc/USD.doc/Makefile
deleted file mode 100644
index 4a272a5..0000000
--- a/usr.bin/dc/USD.doc/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$FreeBSD$
-#	$OpenBSD: Makefile,v 1.2 2004/02/01 15:18:01 jmc Exp $
-
-DOC=	dc
-DIR=	usd/05.dc
-SRCS=	dc
-MACROS=	-ms
-BINDIR=	/usr/share/doc/papers
-
-paper.ps: ${SRCS}
-	${EQN} ${SRCS} | ${ROFF} > ${.TARGET}
-
-paper.txt: ${SRCS}
-	${EQN} -Tascii ${SRCS} | ${ROFF} -Tascii > ${.TARGET}
-
-.include <bsd.doc.mk>