summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-05-10 16:38:54 +0000
committerimp <imp@FreeBSD.org>2014-05-10 16:38:54 +0000
commitfe4a9fe3d31ca1e610e47cd5aab678df3ae9a586 (patch)
tree1add913f40a777c2efcca37e81051d7d9bfd95cf /share
parentc6d68cfa0a3f66fd1001846ad4a92106ff1436a9 (diff)
downloadFreeBSD-src-fe4a9fe3d31ca1e610e47cd5aab678df3ae9a586.zip
FreeBSD-src-fe4a9fe3d31ca1e610e47cd5aab678df3ae9a586.tar.gz
Move DOCCOMPRESS to MK variable.
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.doc.mk8
-rw-r--r--share/mk/bsd.opts.mk1
2 files changed, 5 insertions, 4 deletions
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 49b2d9b..836ace9 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -19,7 +19,7 @@
#
# MACROS Macro packages used to build the document. [not set]
#
-# NO_DOCCOMPRESS If you do not want formatted troff documents to be
+# WITHOUT_DOCCOMPRESS If you do not want formatted troff documents to be
# compressed when they are installed. [not set]
#
# PRINTERDEVICE Indicates which output formats will be generated
@@ -87,7 +87,7 @@ DCOMPRESS_CMD?= ${COMPRESS_CMD}
DFILE.html= ${DOC}.html
.endfor
.for _dev in ${PRINTERDEVICE:Nhtml}
-.if defined(NO_DOCCOMPRESS)
+.if ${MK_DOCCOMPRESS} == "no"
DFILE.${_dev}= ${DOC}.${_dev}
.else
DFILE.${_dev}= ${DOC}.${_dev}${DCOMPRESS_EXT}
@@ -117,7 +117,7 @@ print: ${DFILE.${_dev}}
.endfor
print:
.for _dev in ${PRINTERDEVICE}
-.if defined(NO_DOCCOMPRESS)
+.if ${MK_DOCCOMPRESS} == "no"
${LPR} ${DFILE.${_dev}}
.else
${DCOMPRESS_CMD} -d ${DFILE.${_dev}} | ${LPR}
@@ -164,7 +164,7 @@ CLEANFILES+= _stamp.extra
${DFILE.${_dev}}: _stamp.extra
.endif
${DFILE.${_dev}}: ${SRCS}
-.if defined(NO_DOCCOMPRESS)
+.if ${MK_DOCCOMPRESS} == "no"
${ROFF.${_dev}} ${.ALLSRC:N_stamp.extra} > ${.TARGET}
.else
${ROFF.${_dev}} ${.ALLSRC:N_stamp.extra} | ${DCOMPRESS_CMD} > ${.TARGET}
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 885d922..327b997 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -45,6 +45,7 @@ __<bsd.opts.mk>__:
__DEFAULT_YES_OPTIONS = \
ASSERT_DEBUG \
+ DOCCOMPRESS \
INFO \
INSTALLLIB \
KERBEROS \
OpenPOWER on IntegriCloud