Module Name: src
Committed By: joerg
Date: Wed Jan 12 23:03:24 UTC 2011
Modified Files:
src/share/mk: bsd.man.mk
Log Message:
mandoc now supports tbl(1) formatting, so adjust rules.
Use -Wstop in lintmanpages.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/share/mk/bsd.man.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.man.mk
diff -u src/share/mk/bsd.man.mk:1.105 src/share/mk/bsd.man.mk:1.106
--- src/share/mk/bsd.man.mk:1.105 Thu Dec 2 23:08:04 2010
+++ src/share/mk/bsd.man.mk Wed Jan 12 23:03:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.man.mk,v 1.105 2010/12/02 23:08:04 wiz Exp $
+# $NetBSD: bsd.man.mk,v 1.106 2011/01/12 23:03:24 joerg Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include <bsd.init.mk>
@@ -128,10 +128,7 @@
${_MNUMBERS:@n...@.$n.cat$n${mansuffix}@}: ${CATDEPS} # build rule
${_MKTARGET_FORMAT}
-.if defined(USETBL)
- ${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_ASCII} -mandoc ${MANCOMPRESS} \
- > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
-.elif ${MKMANDOC} == yes && !defined(NOMANDOC)
+.if ${MKMANDOC} == yes && !defined(NOMANDOC)
if test ""${NOMANDOC.${.IMPSRC:T}:tl:Q} != "yes"; then \
${TOOL_MANDOC_ASCII} ${.IMPSRC} ${MANCOMPRESS} \
> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}; \
@@ -139,6 +136,9 @@
${TOOL_ROFF_ASCII} -mandoc ${.IMPSRC} ${MANCOMPRESS} \
> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}; \
fi
+.elif defined(USETBL)
+ ${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_ASCII} -mandoc ${MANCOMPRESS} \
+ > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
.else
${TOOL_ROFF_ASCII} -mandoc ${.IMPSRC} ${MANCOMPRESS} \
> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
@@ -262,7 +262,7 @@
.if !empty(MANPAGES)
lintmanpages: ${MANPAGES}
- ${TOOL_MANDOC_LINT} -Tlint -fstrict -Wall ${.ALLSRC}
+ ${TOOL_MANDOC_LINT} -Tlint -fstrict -Wall,stop ${.ALLSRC}
.endif
##### Pull in related .mk logic
