3 files changed, 10 insertions, 7 deletions

diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile
index 33bb3f1b2bba..f7282e5d3370 100644
--- a/share/doc/papers/px/Makefile
+++ b/share/doc/papers/px/Makefile
@@ -1,15 +1,18 @@
-#	@(#)Makefile	5.3 (Berkeley) 6/8/93
+#	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
+#	$Id$
 
-DIR=	papers/px
+VOLUME=	papers
+DOC=	px
 SRCS=	pxin0.n pxin1.n pxin2.n pxin3.n pxin4.n
 EXTRA=	fig1.1.n fig1.2.n fig1.3.n fig2.3.raw fig2.4.n fig3.2.n \
 	fig3.3.n table2.1.n table2.2.n table2.3.n table3.1.n tmac.p
 CLEANFILES+=fig2.3.n
+DPADD+=	fig2.3.n
 
-paper.ps: ${SRCS} fig2.3.n
-	${SOELIM} ${SRCS} | ${TBL} | ${ROFF} > ${.TARGET}
+USE_SOELIM=	yes
+USE_TBL=	yes
 
 fig2.3.n: fig2.3.raw
-	sort fig2.3.raw >fig2.3.n
+	sort ${.CURDIR}/fig2.3.raw >fig2.3.n
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/px/table2.3.n b/share/doc/papers/px/table2.3.n
index 51796aef9a04..974dd7e4f417 100644
--- a/share/doc/papers/px/table2.3.n
+++ b/share/doc/papers/px/table2.3.n
@@ -41,5 +41,5 @@ _
 Mnemonic	Reference	Description
 =
 .TH
-.so fig2.3.n
+.so obj/fig2.3.n
 .TE
diff --git a/share/doc/papers/px/tmac.p b/share/doc/papers/px/tmac.p
index b6f381ab0ba9..8836d4101e05 100644
--- a/share/doc/papers/px/tmac.p
+++ b/share/doc/papers/px/tmac.p
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)tmac.p	5.2 (Berkeley) 4/17/91
 .\"
-'if \n(FM=0 'so /usr/lib/tmac/tmac.s
+'if \n(FM=0 'so /usr/share/tmac/tmac.s
 .if n .nr FM 1.2i
 .if t .tr *\(**=\(eq/\(sl+\(pl
 .bd S B 3