diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-04-03 19:34:01 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-04-03 19:34:01 +0000 |
| commit | 90cd3bb4579d911b266e61e05eefef890a41fa5b (patch) | |
| tree | 7a841b16793766d45f10502606907a4c9b1281e0 | |
| parent | 94222fa637ece26f0cdaeaaa1794303a6fd5d07a (diff) | |
Build all manual pages in base with mandoc(1) instead of groff,
excepting the tbl(1) pages, which are less than twenty.
"commit the diff that enables it, now" deraadt@
| -rw-r--r-- | lib/libssl/man/Makefile | 6 | ||||
| -rw-r--r-- | share/mk/bsd.man.mk | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/libssl/man/Makefile b/lib/libssl/man/Makefile index 18560c7eb38..7dc23fbe799 100644 --- a/lib/libssl/man/Makefile +++ b/lib/libssl/man/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2009/04/10 06:04:49 djm Exp $ +# $OpenBSD: Makefile,v 1.16 2010/04/03 19:34:00 schwarze Exp $ .include <bsd.own.mk> # for NOMAN @@ -286,7 +286,7 @@ PSALL= ${MANALL:S/.cat1/.ps1/g:S/.cat2/.ps2/g:S/.cat3/.ps3/g:S/.cat4/.ps4/g:S/.c ${page}.cat3: ${src}.pod ${POD2MAN} --section=3 --name=${page:U} ${.ALLSRC} | \ - nroff -Tascii -mandoc > ${.TARGET} + ${MANDOC} > ${.TARGET} . if MANPS ${page}.ps3: ${src}.pod ${POD2MAN} --section=3 --name=${page:U} ${.ALLSRC} | \ @@ -1088,7 +1088,7 @@ maninstall: .pod.cat${sect}: ${POD2MAN} --section=${sect} --name=${*:U} ${.ALLSRC} | \ - nroff -Tascii -mandoc > ${.TARGET} + ${MANDOC} > ${.TARGET} .pod.ps${sect}: ${POD2MAN} --section=${sect} --name=${*:U} ${.ALLSRC} | \ diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 929a6450b6a..87fece8c12f 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -1,8 +1,9 @@ -# $OpenBSD: bsd.man.mk,v 1.29 2007/11/03 10:30:40 espie Exp $ +# $OpenBSD: bsd.man.mk,v 1.30 2010/04/03 19:34:00 schwarze Exp $ # $NetBSD: bsd.man.mk,v 1.23 1996/02/10 07:49:33 jtc Exp $ # @(#)bsd.man.mk 5.2 (Berkeley) 5/11/90 MANTARGET?= cat +MANDOC?= mandoc NROFF?= nroff -Tascii TBL?= tbl MANLINT?= \# @@ -21,9 +22,8 @@ MANLINT?= \# .ps1 .ps2 .ps3 .ps3p .ps4 .ps5 .ps6 .ps7 .ps8 .ps9 .9.cat9 .8.cat8 .7.cat7 .6.cat6 .5.cat5 .4.cat4 .3p.cat3p .3.cat3 .2.cat2 .1.cat1: - @echo "${NROFF} -mandoc ${.IMPSRC} > ${.TARGET}" - @${MANLINT} ${.IMPSRC} - @${NROFF} -mandoc ${.IMPSRC} > ${.TARGET} || (rm -f ${.TARGET}; false) + @echo "${MANDOC} ${.IMPSRC} > ${.TARGET}" + @${MANDOC} ${.IMPSRC} > ${.TARGET} || (rm -f ${.TARGET}; false) .9tbl.cat9 .8tbl.cat8 .7tbl.cat7 .6tbl.cat6 .5tbl.cat5 .4tbl.cat4 .3tbl.cat3 \ .2tbl.cat2 .1tbl.cat1: |