From owner-svn-src-all@FreeBSD.ORG Sat May 10 16:38:55 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C76125B7; Sat, 10 May 2014 16:38:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A871921A; Sat, 10 May 2014 16:38:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AGctY6007023; Sat, 10 May 2014 16:38:55 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AGcsVX007017; Sat, 10 May 2014 16:38:54 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201405101638.s4AGcsVX007017@svn.freebsd.org> From: Warner Losh Date: Sat, 10 May 2014 16:38:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r265838 - in head: share/mk tools/build/options X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 16:38:56 -0000 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 @@ ____: __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. + +