d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bsd.doc.mk changes:

Browse Source 
Don't gratuitously pipe thru a cat(1) if NODOCCOMPRESS.

Only create _stamp.extra when necessary.

Get rid of SOELIMPP and OBJS.

Use Groff version of soelim(1); we need its -I option
for the following to work.

Don't needlessly chdir to SRCDIR.  Only a few documents
need CD_HACK, and those that need it either use refer(1)
or .PSPIC macro which internally uses the .psbb call.
This commit is contained in:
Ruslan Ermilov 2002-10-29 14:56:09 +00:00
parent 408b5dd1c3
commit b382ba4fb1
31 changed files with 164 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/usr.bin/groff/src/preproc/Makefile
View File

@ -1,8 +1,5 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR= eqn grn html pic refer tbl SUBDIR= eqn grn html pic refer soelim tbl
# BSD already provides soelim(1)
MISC= soelim
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

1
lib/libc/rpc/PSD.doc/nfs.rfc.ms
View File

@ -4,7 +4,6 @@
.\" @(#)nfs.rfc.ms 2.2 88/08/05 4.0 RPCSRC .\" @(#)nfs.rfc.ms 2.2 88/08/05 4.0 RPCSRC
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.so stubs
.de BT .de BT
.if \\n%=1 .tl ''- % -'' .if \\n%=1 .tl ''- % -''
.. ..

1
lib/libc/rpc/PSD.doc/rpc.prog.ms
View File

@ -4,7 +4,6 @@
.\" @(#)rpc.prog.ms 2.3 88/08/11 4.0 RPCSRC .\" @(#)rpc.prog.ms 2.3 88/08/11 4.0 RPCSRC
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.so stubs
.de BT .de BT
.if \\n%=1 .tl ''- % -'' .if \\n%=1 .tl ''- % -''
.. ..

1
lib/libc/rpc/PSD.doc/rpc.rfc.ms
View File

@ -4,7 +4,6 @@
.\" @(#)rpc.rfc.ms 2.2 88/08/05 4.0 RPCSRC .\" @(#)rpc.rfc.ms 2.2 88/08/05 4.0 RPCSRC
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.so stubs
.de BT .de BT
.if \\n%=1 .tl ''- % -'' .if \\n%=1 .tl ''- % -''
.. ..

1
lib/libc/rpc/PSD.doc/rpcgen.ms
View File

@ -4,7 +4,6 @@
.\" @(#)rpcgen.ms 2.2 88/08/04 4.0 RPCSRC .\" @(#)rpcgen.ms 2.2 88/08/04 4.0 RPCSRC
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.so stubs
.de BT .de BT
.if \\n%=1 .tl ''- % -'' .if \\n%=1 .tl ''- % -''
.. ..

1
lib/libc/rpc/PSD.doc/xdr.nts.ms
View File

@ -4,7 +4,6 @@
.\" @(#)xdr.nts.ms 2.2 88/08/05 4.0 RPCSRC .\" @(#)xdr.nts.ms 2.2 88/08/05 4.0 RPCSRC
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.so stubs
.EQ .EQ
delim $$ delim $$
.EN .EN

1
lib/libc/rpc/PSD.doc/xdr.rfc.ms
View File

@ -4,7 +4,6 @@
.\" @(#)xdr.rfc.ms 2.2 88/08/05 4.0 RPCSRC .\" @(#)xdr.rfc.ms 2.2 88/08/05 4.0 RPCSRC
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.so stubs
.de BT .de BT
.if \\n%=1 .tl ''- % -'' .if \\n%=1 .tl ''- % -''
.. ..

11
share/doc/papers/bufbio/Makefile
View File

@ -1,9 +1,10 @@
# $FreeBSD$ # $FreeBSD$
USE_PIC=1 VOLUME= papers
VOLUME= papers DOC= bio
DOC= bio SRCS= bio.ms
SRCS= bio.ms MACROS= -ms
MACROS= -ms USE_PIC= YES
CD_HACK= ${.CURDIR}
.include <bsd.doc.mk> .include <bsd.doc.mk>

13
share/doc/papers/jail/Makefile
View File

@ -1,8 +1,11 @@
# $FreeBSD$ # $FreeBSD$
VOLUME= papers
DOC= jail VOLUME= papers
SRCS= paper.ms DOC= jail
EXTRA= implementation.ms mgt.ms future.ms SRCS= paper.ms
MACROS= -ms EXTRA= implementation.ms mgt.ms future.ms
MACROS= -ms
USE_SOELIM= YES
CD_HACK= ${.CURDIR}
.include <bsd.doc.mk> .include <bsd.doc.mk>

26
share/doc/papers/kernmalloc/Makefile
View File

@ -1,20 +1,18 @@
# From: @(#)Makefile 1.8 (Berkeley) 6/8/93 # From: @(#)Makefile 1.8 (Berkeley) 6/8/93
# $FreeBSD$ # $FreeBSD$
VOLUME= papers VOLUME= papers
DOC= kernmalloc DOC= kernmalloc
SRCS= kernmalloc.ms appendix.ms SRCS= kernmalloc.t appendix.ms
SRCDIR= ${.OBJDIR} # ack! EXTRA= alloc.fig usage.tbl
MACROS= -ms MACROS= -ms
USE_TBL= yes USE_EQN= YES
USE_PIC= yes USE_PIC= YES
USE_EQN= yes USE_SOELIM= YES
CLEANFILES+= kernmalloc.ms appendix.ms USE_TBL= YES
CLEANFILES= appendix.ms
kernmalloc.ms: kernmalloc.t alloc.fig usage.tbl appendix.ms: appendix.t
(cd ${.CURDIR}; ${SOELIM} kernmalloc.t) > ${.TARGET} ${GRIND} < ${.ALLSRC} > ${.TARGET}
appendix.ms: appendix.t
vgrind -f < ${.CURDIR}/appendix.t > ${.TARGET}
.include <bsd.doc.mk> .include <bsd.doc.mk>

23
share/doc/papers/px/Makefile
View File

@ -1,20 +1,17 @@
# From: @(#)Makefile 5.3 (Berkeley) 6/8/93 # From: @(#)Makefile 5.3 (Berkeley) 6/8/93
# $FreeBSD$ # $FreeBSD$
VOLUME= papers VOLUME= papers
DOC= px DOC= px
SRCS= tmac.p pxin0.n pxin1.n pxin2.n pxin3.n pxin4.n SRCS= tmac.p 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 \ EXTRA= fig1.1.n fig1.2.n fig1.3.n fig2.3.n fig2.4.n fig3.2.n \
fig3.3.n table2.1.n table2.2.n table2.3.n table3.1.n fig3.3.n table2.1.n table2.2.n table2.3.n table3.1.n
OBJS= fig2.3.n MACROS= -ms
CLEANFILES+=fig2.3.n USE_SOELIM= YES
MACROS= -ms USE_TBL= YES
CLEANFILES= fig2.3.n
USE_SOELIM= yes
USE_SOELIMPP= yes
USE_TBL= yes
fig2.3.n: fig2.3.raw fig2.3.n: fig2.3.raw
sort ${.CURDIR}/fig2.3.raw >fig2.3.n sort ${.ALLSRC} >${.TARGET}
.include <bsd.doc.mk> .include <bsd.doc.mk>

14
share/doc/papers/relengr/Makefile
View File

@ -1,12 +1,12 @@
# From: @(#)Makefile 1.6 (Berkeley) 6/8/93 # From: @(#)Makefile 1.6 (Berkeley) 6/8/93
# $FreeBSD$ # $FreeBSD$
VOLUME= papers VOLUME= papers
DOC= releng DOC= releng
SRCS= 0.t 1.t 2.t 3.t SRCS= 0.t 1.t 2.t 3.t
MACROS= -ms EXTRA= ref.bib
EXTRA= ref.bib MACROS= -ms
USE_REFER= YES
USE_REFER= yes CD_HACK= ${.CURDIR}
.include <bsd.doc.mk> .include <bsd.doc.mk>

16
share/doc/papers/sysperf/Makefile
View File

@ -1,16 +1,14 @@
# From: @(#)Makefile 1.6 (Berkeley) 6/8/93 # From: @(#)Makefile 1.6 (Berkeley) 6/8/93
# $FreeBSD$ # $FreeBSD$
VOLUME= papers VOLUME= papers
DOC= sysperf DOC= sysperf
MACROS= -ms SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t appendix.tmp
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t EXTRA= a1.t a2.t
EXTRA= a1.t a2.t MACROS= -ms
SRCS+= appendix.tmp USE_EQN= YES
USE_TBL= YES
CLEANFILES= appendix.tmp CLEANFILES= appendix.tmp
SRCDIR= ${.OBJDIR}
USE_EQN= yes
USE_TBL= yes
appendix.tmp: a1.t a2.t appendix.tmp: a1.t a2.t
${GRIND} ${.CURDIR}/a1.t | awk '/\.\(\)/{ cnt = 2 } \ ${GRIND} ${.CURDIR}/a1.t | awk '/\.\(\)/{ cnt = 2 } \

14
share/doc/psd/01.cacm/Makefile
View File

@ -1,12 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 6/8/93 # @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$ # $FreeBSD$
VOLUME= psd/01.cacm VOLUME= psd/01.cacm
SRCS= p.mac p1 p2 p3 p4 p5 p6 SRCS= p.mac p1 p2 p3 p4 p5 p6
EXTRA= ref.bib EXTRA= ref.bib
MACROS= -ms MACROS= -ms
USE_REFER= YES
USE_REFER= yes USE_TBL= YES
USE_TBL= yes CD_HACK= ${.CURDIR}
.include <bsd.doc.mk> .include <bsd.doc.mk>

16
share/doc/psd/02.implement/Makefile
View File

@ -1,13 +1,13 @@
# @(#)Makefile 8.1 (Berkeley) 6/8/93 # @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$ # $FreeBSD$
VOLUME= psd/02.implement VOLUME= psd/02.implement
SRCS= implement SRCS= implement
EXTRA= ref.bib EXTRA= ref.bib
MACROS= -ms MACROS= -ms
USE_PIC= YES
USE_PIC= yes USE_REFER= YES
USE_REFER= yes USE_SOELIM= YES
USE_SOELIM= yes CD_HACK= ${.CURDIR}
.include <bsd.doc.mk> .include <bsd.doc.mk>

2
share/doc/psd/12.make/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
VOLUME= psd/12.make VOLUME= psd/12.make
SRCS= tutorial.ms SRCS= stubs tutorial.ms
MACROS= -ms MACROS= -ms
SRCDIR= ${.CURDIR}/../../../../usr.bin/make/PSD.doc SRCDIR= ${.CURDIR}/../../../../usr.bin/make/PSD.doc

12
share/doc/psd/15.yacc/Makefile
View File

@ -1,11 +1,11 @@
# @(#)Makefile 8.1 (Berkeley) 8/14/93 # @(#)Makefile 8.1 (Berkeley) 8/14/93
# $FreeBSD$ # $FreeBSD$
VOLUME= psd/15.yacc VOLUME= psd/15.yacc
SRCS= ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 ssA ssB ssa ssb ssc ssd SRCS= ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 ssA ssB ssa ssb ssc ssd
EXTRA= ref.bib EXTRA= ref.bib
MACROS= -ms MACROS= -ms
USE_REFER= YES
USE_REFER= yes CD_HACK= ${.CURDIR}
.include <bsd.doc.mk> .include <bsd.doc.mk>

11
share/doc/psd/22.rpcgen/Makefile
View File

@ -1,10 +1,9 @@
# $FreeBSD$ # $FreeBSD$
VOLUME= psd/22.rpcgen VOLUME= psd/22.rpcgen
SRCS= rpcgen.ms SRCS= stubs rpcgen.ms
MACROS= -ms MACROS= -ms
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc USE_TBL= YES
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
USE_TBL= yes
.include <bsd.doc.mk> .include <bsd.doc.mk>

13
share/doc/psd/23.rpc/Makefile
View File

@ -1,11 +1,10 @@
# $FreeBSD$ # $FreeBSD$
VOLUME= psd/23.rpc VOLUME= psd/23.rpc
SRCS= rpc.prog.ms SRCS= stubs rpc.prog.ms
MACROS= -ms MACROS= -ms
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc USE_TBL= YES
USE_PIC= YES
USE_TBL= yes SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
USE_PIC= yes
.include <bsd.doc.mk> .include <bsd.doc.mk>

11
share/doc/psd/24.xdr/Makefile
View File

@ -1,10 +1,9 @@
# $FreeBSD$ # $FreeBSD$
VOLUME= psd/24.xdr VOLUME= psd/24.xdr
SRCS= xdr.nts.ms SRCS= stubs xdr.nts.ms
MACROS= -ms MACROS= -ms
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc USE_EQN= YES
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
USE_EQN= yes
.include <bsd.doc.mk> .include <bsd.doc.mk>

11
share/doc/psd/25.xdrrfc/Makefile
View File

@ -1,10 +1,9 @@
# $FreeBSD$ # $FreeBSD$
VOLUME= psd/25.xdrrfc VOLUME= psd/25.xdrrfc
SRCS= xdr.rfc.ms SRCS= stubs xdr.rfc.ms
MACROS= -ms MACROS= -ms
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc USE_TBL= YES
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
USE_TBL= yes
.include <bsd.doc.mk> .include <bsd.doc.mk>

11
share/doc/psd/26.rpcrfc/Makefile
View File

@ -1,10 +1,9 @@
# $FreeBSD$ # $FreeBSD$
VOLUME= psd/26.rpcrfc VOLUME= psd/26.rpcrfc
SRCS= rpc.rfc.ms SRCS= stubs rpc.rfc.ms
MACROS= -ms MACROS= -ms
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc USE_TBL= YES
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
USE_TBL= yes
.include <bsd.doc.mk> .include <bsd.doc.mk>

11
share/doc/psd/27.nfsrpc/Makefile
View File

@ -1,10 +1,9 @@
# $FreeBSD$ # $FreeBSD$
VOLUME= psd/27.nfsrfc VOLUME= psd/27.nfsrfc
SRCS= nfs.rfc.ms SRCS= stubs nfs.rfc.ms
MACROS= -ms MACROS= -ms
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc USE_TBL= YES
SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
USE_TBL= yes
.include <bsd.doc.mk> .include <bsd.doc.mk>

26
share/doc/usd/13.viref/Makefile
View File

@ -1,27 +1,25 @@
# From: @(#)Makefile 8.16 (Berkeley) 8/15/94 # From: @(#)Makefile 8.16 (Berkeley) 8/15/94
# $FreeBSD$ # $FreeBSD$
VOLUME= usd/13.viref VOLUME= usd/13.viref
SRCS= vi.ref SRCS= vi.ref
EXTRA= ex.cmd.roff ref.so set.opt.roff vi.cmd.roff EXTRA= ex.cmd.roff ref.so set.opt.roff vi.cmd.roff index.so
OBJS= index.so MACROS= -me
MACROS= -me -U CLEANFILES= index index.so
CLEANFILES+=index index.so TRFLAGS= -U # this is to hide warnings only
USE_SOELIM= yes USE_SOELIM= YES
USE_SOELIMPP= yes USE_TBL= YES
USE_TBL= yes SRCDIR= ${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/vi.ref
SRCDIR= ${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/vi.ref
# Build index.so as a side-effect of building the paper. # Build index.so as a side-effect of building the paper.
index.so: ${SRCS} ${EXTRA} index.so: ${SRCS} ${EXTRA:Nindex.so}
(cd ${SRCDIR}; ${SOELIMPP} -e 's:^\.so index.so$$::' ${SRCS}) | \ (cd ${SRCDIR}; sed -e 's:^\.so index.so$$::' ${SRCS}) | ${ROFF} -U -z
${ROFF} > /dev/null
sed -e 's/MINUSSIGN/-/' \ sed -e 's/MINUSSIGN/-/' \
-e 's/DOUBLEQUOTE/""/' \ -e 's/DOUBLEQUOTE/""/' \
-e "s/SQUOTE/'/" \ -e "s/SQUOTE/'/" \
-e 's/ /__SPACE/g' < index | \ -e 's/ /__SPACE/g' < index | \
sort -u '-t ' -k 1,1 -k 2n | awk -f ${SRCDIR}/merge.awk | \ sort -u '-t ' -k 1,1 -k 2n | awk -f ${SRCDIR}/merge.awk | \
sed -e 's/__SPACE/ /g' \ sed -e 's/__SPACE/ /g' \
-e "s/^\\(['\\.]\\)/\\\\\&\\1/" > index.so -e "s/^\\(['\\.]\\)/\\\\\&\\1/" > index.so
.include <bsd.doc.mk> .include <bsd.doc.mk>

15
share/doc/usd/19.memacros/Makefile
View File

@ -1,14 +1,11 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/8/93 # From: @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$ # $FreeBSD$
VOLUME= usd/19.memacros VOLUME= usd/19.memacros
SRCS= meintro.me-sed SRCS= meintro.me-sed
MACROS= -me MACROS= -me
SRCDIR= ${.OBJDIR} GROFFDIR= ${.CURDIR}/../../../../contrib/groff
SRCDIR= ${GROFFDIR}/doc
GROFFDIR=${.CURDIR}/../../../../contrib/groff
.PATH: ${GROFFDIR}/doc
version=`cat ${GROFFDIR}/VERSION` version=`cat ${GROFFDIR}/VERSION`
revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ${GROFFDIR}/REVISION` revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ${GROFFDIR}/REVISION`
@ -16,6 +13,6 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ${GROFFDIR}/REVISION`
meintro.me-sed: meintro.me meintro.me-sed: meintro.me
sed -e "s;@VERSION@;$(version)$(revision);" ${.ALLSRC} > ${.TARGET} sed -e "s;@VERSION@;$(version)$(revision);" ${.ALLSRC} > ${.TARGET}
CLEANFILES+=${SRCS} CLEANFILES= ${SRCS}
.include <bsd.doc.mk> .include <bsd.doc.mk>

15
share/doc/usd/20.meref/Makefile
View File

@ -1,14 +1,11 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/8/93 # From: @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$ # $FreeBSD$
VOLUME= usd/20.meref VOLUME= usd/20.meref
SRCS= meref.me-sed SRCS= meref.me-sed
MACROS= -me MACROS= -me
SRCDIR= ${.OBJDIR} GROFFDIR= ${.CURDIR}/../../../../contrib/groff
SRCDIR= ${GROFFDIR}/doc
GROFFDIR=${.CURDIR}/../../../../contrib/groff
.PATH: ${GROFFDIR}/doc
version=`cat ${GROFFDIR}/VERSION` version=`cat ${GROFFDIR}/VERSION`
revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ${GROFFDIR}/REVISION` revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ${GROFFDIR}/REVISION`
@ -16,6 +13,6 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ${GROFFDIR}/REVISION`
meref.me-sed: meref.me meref.me-sed: meref.me
sed -e "s;@VERSION@;$(version)$(revision);" ${.ALLSRC} > ${.TARGET} sed -e "s;@VERSION@;$(version)$(revision);" ${.ALLSRC} > ${.TARGET}
CLEANFILES+=${SRCS} CLEANFILES= ${SRCS}
.include <bsd.doc.mk> .include <bsd.doc.mk>

8
share/doc/usd/21.troff/Makefile
View File

@ -1,10 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 8/14/93 # @(#)Makefile 8.1 (Berkeley) 8/14/93
# $FreeBSD$ # $FreeBSD$
VOLUME= usd/21.troff VOLUME= usd/21.troff
SRCS= m0 m0a m1 m2 m3 m4 m5 SRCS= m.mac m0 m0a m1 m2 m3 m4 m5 table1 table2
SRCS+= table1 table2 USE_TBL= YES
MACROS= m.mac
USE_TBL=YES
.include <bsd.doc.mk> .include <bsd.doc.mk>

1
share/doc/usd/22.trofftut/Makefile
View File

@ -41,6 +41,5 @@ VOLUME= usd/22.trofftut
SRCS= tt.mac tt00 tt01 tt02 tt03 tt04 tt05 tt06 tt07 tt08 tt09 tt10 \ SRCS= tt.mac tt00 tt01 tt02 tt03 tt04 tt05 tt06 tt07 tt08 tt09 tt10 \
tt11 tt12 tt13 tt14 ttack ttcharset ttindex tt11 tt12 tt13 tt14 ttack ttcharset ttindex
MACROS= -ms MACROS= -ms
SRCDIR= ${.OBJDIR}
.include <bsd.doc.mk> .include <bsd.doc.mk>

62
share/mk/bsd.doc.mk
View File

@ -26,16 +26,11 @@ INDXBIB?= indxbib
PIC?= pic PIC?= pic
REFER?= refer REFER?= refer
.if ${PRINTERDEVICE} == "ascii" .if ${PRINTERDEVICE} == "ascii"
ROFF?= groff -mtty-char ${TRFLAGS} ${MACROS} -o${PAGES} ROFF?= groff -mtty-char ${TRFLAGS} ${MACROS} -o${PAGES}
.else .else
ROFF?= groff ${TRFLAGS} ${MACROS} -o${PAGES} ROFF?= groff ${TRFLAGS} ${MACROS} -o${PAGES}
.endif .endif
SOELIM?= soelim SOELIM?= soelim
SOELIMPP= sed ${SOELIMPPARGS}
SOELIMPPARGS0= ${SRCS} ${EXTRA}
SOELIMPPARGS1= ${SOELIMPPARGS0:S/^/-e\\ \'s:\(\.so[\\ \\ ][\\ \\ ]*\)\(/}
SOELIMPPARGS2= ${SOELIMPPARGS1:S/$/\)\$:\1${SRCDIR}\/\2:\'/}
SOELIMPPARGS= ${SOELIMPPARGS2:S/\\'/'/g}
TBL?= tbl TBL?= tbl
DOC?= paper DOC?= paper
@ -45,25 +40,24 @@ TRFLAGS+= -T${PRINTERDEVICE}
.if defined(USE_EQN) .if defined(USE_EQN)
TRFLAGS+= -e TRFLAGS+= -e
.endif .endif
.if defined(USE_TBL)
TRFLAGS+= -t
.endif
.if defined(USE_PIC) .if defined(USE_PIC)
TRFLAGS+= -p TRFLAGS+= -p
.endif .endif
.if defined(USE_SOELIM)
TRFLAGS+= -s
.endif
.if defined(USE_REFER) .if defined(USE_REFER)
TRFLAGS+= -R TRFLAGS+= -R
.endif .endif
.if defined(USE_SOELIM)
TRFLAGS+= -I${SRCDIR}
.endif
.if defined(USE_TBL)
TRFLAGS+= -t
.endif
DCOMPRESS_EXT?= ${COMPRESS_EXT} DCOMPRESS_EXT?= ${COMPRESS_EXT}
.if defined(NODOCCOMPRESS) || ${PRINTERDEVICE} == "html" .if defined(NODOCCOMPRESS) || ${PRINTERDEVICE} == "html"
DFILE= ${DOC}.${PRINTERDEVICE} DFILE= ${DOC}.${PRINTERDEVICE}
DCOMPRESS_CMD= cat
.else .else
DFILE= ${DOC}.${PRINTERDEVICE}${DCOMPRESS_EXT} DFILE= ${DOC}.${PRINTERDEVICE}${DCOMPRESS_EXT}
DCOMPRESS_CMD?= ${COMPRESS_CMD} DCOMPRESS_CMD?= ${COMPRESS_CMD}
.endif .endif
@ -77,12 +71,12 @@ UNROFFFLAGS+= split=1
.endif .endif
# Compatibility mode flag for groff. Use this when formatting documents with # Compatibility mode flag for groff. Use this when formatting documents with
# Berkeley me macros. # Berkeley me macros (orig_me(7)).
COMPAT?= -C COMPAT?= -C
.PATH: ${.CURDIR} ${SRCDIR} .PATH: ${.CURDIR} ${SRCDIR}
all: ${DFILE} all: ${DFILE}
.if !target(print) .if !target(print)
print: ${DFILE} print: ${DFILE}
@ -103,36 +97,46 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
realinstall: realinstall:
.if ${PRINTERDEVICE} == "html" .if ${PRINTERDEVICE} == "html"
cd ${SRCDIR}; \ cd ${SRCDIR}; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
.else .else
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${DFILE} ${DESTDIR}${BINDIR}/${VOLUME} ${DFILE} ${DESTDIR}${BINDIR}/${VOLUME}
.endif .endif
spell: ${SRCS} spell: ${SRCS}
(cd ${.CURDIR}; spell ${SRCS} ) | sort | \ (cd ${.CURDIR}; spell ${SRCS} ) | sort | \
comm -23 - ${.CURDIR}/spell.ok > ${DOC}.spell comm -23 - ${.CURDIR}/spell.ok > ${DOC}.spell
BINDIR?= /usr/share/doc BINDIR?= /usr/share/doc
BINMODE= 444 BINMODE= 444
SRCDIR?= ${.CURDIR} SRCDIR?= ${.CURDIR}
.if !target(${DFILE}) .if !target(${DFILE})
_stamp.extraobjs: ${EXTRA} ${OBJS} .if defined(EXTRA) && !empty(EXTRA)
_stamp.extra: ${EXTRA}
touch ${.TARGET} touch ${.TARGET}
CLEANFILES+= _stamp.extraobjs CLEANFILES+= _stamp.extra
${DFILE}: ${SRCS} _stamp.extraobjs ${DFILE}: _stamp.extra
.endif
${DFILE}: ${SRCS}
.if ${PRINTERDEVICE} == "html" .if ${PRINTERDEVICE} == "html"
cd ${SRCDIR}; ${UNROFF} ${MACROS} ${UNROFFFLAGS} \ cd ${SRCDIR}; ${UNROFF} ${MACROS} ${UNROFFFLAGS} \
document=${DOC} ${SRCS} document=${DOC} ${SRCS}
.elif defined(USE_SOELIMPP) .elif defined(NODOCCOMPRESS)
${SOELIMPP} ${.ALLSRC:N_stamp.extraobjs} | ${ROFF} | \ .if defined(CD_HACK)
(cd ${CD_HACK}; ${ROFF} ${.ALLSRC:N_stamp.extra}) > ${.TARGET}
.else
${ROFF} ${.ALLSRC:N_stamp.extra} > ${.TARGET}
.endif
.else
.if defined(CD_HACK)
(cd ${CD_HACK}; ${ROFF} ${.ALLSRC:N_stamp.extra}) | \
${DCOMPRESS_CMD} > ${.TARGET} ${DCOMPRESS_CMD} > ${.TARGET}
.else .else
(cd ${SRCDIR}; ${ROFF} ${.ALLSRC:N_stamp.extraobjs}) | \ ${ROFF} ${.ALLSRC:N_stamp.extra} | ${DCOMPRESS_CMD} > ${.TARGET}
${DCOMPRESS_CMD} > ${.TARGET} .endif
.endif .endif
.endif .endif

1
usr.bin/Makefile
View File

@ -146,7 +146,6 @@ SUBDIR= alias \
shar \ shar \
showmount \ showmount \
sockstat \ sockstat \
soelim \
split \ split \
stat \ stat \
su \ su \

1
usr.bin/make/PSD.doc/tutorial.ms
View File

@ -37,7 +37,6 @@
.\" @(#)tutorial.ms 8.1 (Berkeley) 8/18/93 .\" @(#)tutorial.ms 8.1 (Berkeley) 8/18/93
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.so stubs
.EH 'PSD:12-%''PMake \*- A Tutorial' .EH 'PSD:12-%''PMake \*- A Tutorial'
.OH 'PMake \*- A Tutorial''PSD:12-%' .OH 'PMake \*- A Tutorial''PSD:12-%'
.\" xH is a macro to provide numbered headers that are automatically stuffed .\" xH is a macro to provide numbered headers that are automatically stuffed