8 files changed, 24 insertions, 23 deletions

diff --git a/share/doc/papers/relengr/0.t b/share/doc/papers/relengr/0.t
index c8cec835395b..569be698d4fd 100644
--- a/share/doc/papers/relengr/0.t
+++ b/share/doc/papers/relengr/0.t
@@ -32,9 +32,6 @@
 .\"	@(#)0.t	5.1 (Berkeley) 4/17/91
 .\" $FreeBSD$
 .\"
-.R1
-database ref.bib
-.R2
 .rm CM
 .nr PO 1.25i
 .ds CH "
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index 5898b5a7fdb1..ad7e38ed4e9d 100644
--- a/share/doc/papers/relengr/Makefile
+++ b/share/doc/papers/relengr/Makefile
@@ -3,10 +3,13 @@
 
 VOLUME=		papers
 DOC=		releng
-SRCS=		0.t 1.t 2.t 3.t
+SRCS=		stubs 0.t 1.t 2.t 3.t
 EXTRA=		ref.bib
 MACROS=		-ms
 USE_REFER=	YES
-CD_HACK=	${.CURDIR}
+CLEANFILES=	stubs
+
+stubs:
+	@(echo .R1; echo database ${.CURDIR}/ref.bib; echo .R2) > ${.TARGET}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile
index 8dd5e4143615..78c7eb027929 100644
--- a/share/doc/psd/01.cacm/Makefile
+++ b/share/doc/psd/01.cacm/Makefile
@@ -2,11 +2,15 @@
 # $FreeBSD$
 
 VOLUME=		psd/01.cacm
-SRCS=		p.mac p1 p2 p3 p4 p5 p6
+SRCS=		stubs p.mac p1 p2 p3 p4 p5 p6
 EXTRA=		ref.bib
 MACROS=		-ms
 USE_REFER=	YES
 USE_TBL=	YES
-CD_HACK=	${.CURDIR}
+CLEANFILES=	stubs
+
+stubs:
+	@(echo .R1; echo database ${.CURDIR}/ref.bib; \
+	    echo accumulate; echo .R2) > ${.TARGET}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/01.cacm/p1 b/share/doc/psd/01.cacm/p1
index 2767eebb26c8..88987e02bb06 100644
--- a/share/doc/psd/01.cacm/p1
+++ b/share/doc/psd/01.cacm/p1
@@ -5,10 +5,6 @@
 .\"	@(#)p1	8.1 (Berkeley) 6/8/93
 .\"
 .\" $FreeBSD$
-.R1
-database ref.bib
-accumulate
-.R2
 .OH 'The UNIX Time-Sharing System''PSD:1-%'
 .EH 'PSD:1-%''The UNIX Time-Sharing System'
 .ds n \s+2
diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile
index 67e415f2c262..51aaa80d54ab 100644
--- a/share/doc/psd/02.implement/Makefile
+++ b/share/doc/psd/02.implement/Makefile
@@ -2,12 +2,16 @@
 # $FreeBSD$
 
 VOLUME=		psd/02.implement
-SRCS=		implement
+SRCS=		stubs implement
 EXTRA=		ref.bib
 MACROS=		-ms
 USE_PIC=	YES
 USE_REFER=	YES
 USE_SOELIM=	YES
-CD_HACK=	${.CURDIR}
+CLEANFILES=	stubs
+
+stubs:
+	@(echo .R1; echo database ${.CURDIR}/ref.bib; \
+	    echo accumulate; echo .R2) > ${.TARGET}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/02.implement/implement b/share/doc/psd/02.implement/implement
index debc03bce73a..f6ad7d759191 100644
--- a/share/doc/psd/02.implement/implement
+++ b/share/doc/psd/02.implement/implement
@@ -40,10 +40,6 @@
 .\"	@(#)implement	8.1 (Berkeley) 6/8/93
 .\"
 .\" $FreeBSD$
-.R1
-database ref.bib
-accumulate
-.R2
 .EH 'PSD:2-%''UNIX Implementation'
 .OH 'UNIX Implementation''PSD:2-%'
 .de P1
diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile
index 9dc4a1d31d92..e597df292a0b 100644
--- a/share/doc/psd/15.yacc/Makefile
+++ b/share/doc/psd/15.yacc/Makefile
@@ -2,10 +2,15 @@
 # $FreeBSD$
 
 VOLUME=		psd/15.yacc
-SRCS=		ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 ssA ssB ssa ssb ssc ssd
+SRCS=		stubs ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 \
+		ssA ssB ssa ssb ssc ssd
 EXTRA=		ref.bib
 MACROS=		-ms
 USE_REFER=	YES
-CD_HACK=	${.CURDIR}
+CLEANFILES=	stubs
+
+stubs:
+	@(echo .R1; echo database ${.CURDIR}/ref.bib; \
+	    echo accumulate; echo .R2) > ${.TARGET}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/15.yacc/ss.. b/share/doc/psd/15.yacc/ss..
index 65bea27d54dc..7dd9ea84cdf9 100644
--- a/share/doc/psd/15.yacc/ss..
+++ b/share/doc/psd/15.yacc/ss..
@@ -37,10 +37,6 @@
 .\"	@(#)ss..	8.1 (Berkeley) 6/8/93
 .\"
 .\" $FreeBSD$
-.R1
-database ref.bib
-accumulate
-.R2
 .EH 'PSD:15-%''Yacc: Yet Another Compiler-Compiler'
 .OH 'Yacc: Yet Another Compiler-Compiler''PSD:15-%'
 .\".RP