Author: imp
Date: Sat May 10 16:38:54 2014
New Revision: 265838
URL: http://svnweb.freebsd.org/changeset/base/265838
Log:
Move DOCCOMPRESS to MK variable.
Added:
head/tools/build/options/WITHOUT_DOCCOMPRESS (contents, props changed)
head/tools/build/options/WITHOUT_MANCOMPRESS (contents, props changed)
Modified:
head/share/mk/bsd.doc.mk
head/share/mk/bsd.opts.mk
Modified: head/share/mk/bsd.doc.mk
==============================================================================
--- head/share/mk/bsd.doc.mk Sat May 10 16:38:45 2014 (r265837)
+++ head/share/mk/bsd.doc.mk Sat May 10 16:38:54 2014 (r265838)
@@ -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}
Modified: head/share/mk/bsd.opts.mk
==============================================================================
--- head/share/mk/bsd.opts.mk Sat May 10 16:38:45 2014 (r265837)
+++ head/share/mk/bsd.opts.mk Sat May 10 16:38:54 2014 (r265838)
@@ -45,6 +45,7 @@ __<bsd.opts.mk>__:
__DEFAULT_YES_OPTIONS = \
ASSERT_DEBUG \
+ DOCCOMPRESS \
INFO \
INSTALLLIB \
KERBEROS \
Added: head/tools/build/options/WITHOUT_DOCCOMPRESS
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_DOCCOMPRESS Sat May 10 16:38:54
2014 (r265838)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not to install compressed system documentation.
+Only the uncompressed version will be installed.
+
Added: head/tools/build/options/WITHOUT_MANCOMPRESS
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_MANCOMPRESS Sat May 10 16:38:54
2014 (r265838)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not to install compressed man pages.
+Only the uncompressed versions will be installed.
+
+
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
