Author: bapt
Date: Fri Jan 2 14:05:30 2015
New Revision: 276536
URL: https://svnweb.freebsd.org/changeset/base/276536
Log:
Use mandoc to generate cat pages
Modified:
head/share/mk/bsd.man.mk
Modified: head/share/mk/bsd.man.mk
==============================================================================
--- head/share/mk/bsd.man.mk Fri Jan 2 13:54:03 2015 (r276535)
+++ head/share/mk/bsd.man.mk Fri Jan 2 14:05:30 2015 (r276536)
@@ -38,7 +38,7 @@
# MANBUILDCAT create preformatted manual pages in addition to normal
# pages. [not set]
#
-# MROFF_CMD command and flags to create preformatted pages
+# MANDOC_CMD command and flags to create preformatted pages
#
# +++ targets +++
#
@@ -54,8 +54,7 @@ MINSTALL?= ${INSTALL} -o ${MANOWN} -g ${
CATDIR= ${MANDIR:H:S/$/\/cat/}
CATEXT= .cat
-MROFF_CMD?= groff -Tascii -mtty-char -man -t
-MANDOC_CMD?= mandoc
+MANDOC_CMD?= mandoc -Tascii
MCOMPRESS_CMD?= ${COMPRESS_CMD}
MCOMPRESS_EXT?= ${COMPRESS_EXT}
@@ -101,7 +100,7 @@ ${__target}: ${__page}
.for __target in ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g}
_manpages: ${__target}
${__target}: ${__page}
- ${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} > ${.TARGET}
+ ${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} > ${.TARGET}
.endfor
.endif
.endfor
@@ -114,7 +113,7 @@ CLEANFILES+= ${MAN:T:S/$/${CATEXT}/g}
.for __target in ${__page:T:S/$/${CATEXT}/g}
_manpages: ${__target}
${__target}: ${__page}
- ${MROFF_CMD} ${.ALLSRC} > ${.TARGET}
+ ${MANDOC_CMD} ${.ALLSRC} > ${.TARGET}
.endfor
.endfor
.else
@@ -145,9 +144,9 @@ ${__target}: ${__page}
_manpages: ${__target}
${__target}: ${__page}
.if defined(MANFILTER)
- ${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} | ${MCOMPRESS_CMD} > ${.TARGET}
+ ${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} | ${MCOMPRESS_CMD} >
${.TARGET}
.else
- ${MROFF_CMD} ${.ALLSRC} | ${MCOMPRESS_CMD} > ${.TARGET}
+ ${MANDOC_CMD} ${.ALLSRC} | ${MCOMPRESS_CMD} > ${.TARGET}
.endif
.endfor
.endif
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
