svn commit: r264402 - in head/share: examples/etc man/man5 mk
Warner Losh
imp at FreeBSD.org
Sun Apr 13 05:22:28 UTC 2014
Author: imp
Date: Sun Apr 13 05:22:26 2014
New Revision: 264402
URL: http://svnweb.freebsd.org/changeset/base/264402
Log:
Convert NO_MANCOMPRESS to normal convention.
Modified:
head/share/examples/etc/make.conf
head/share/man/man5/make.conf.5
head/share/mk/bsd.man.mk
head/share/mk/bsd.own.mk
Modified: head/share/examples/etc/make.conf
==============================================================================
--- head/share/examples/etc/make.conf Sun Apr 13 05:22:22 2014 (r264401)
+++ head/share/examples/etc/make.conf Sun Apr 13 05:22:26 2014 (r264402)
@@ -138,7 +138,7 @@
# If you do not want unformatted manual pages to be compressed
# when they are installed:
#
-#NO_MANCOMPRESS=
+#WITHOUT_MANCOMPRESS=t
#
#
# Default format for system documentation, depends on your printer.
Modified: head/share/man/man5/make.conf.5
==============================================================================
--- head/share/man/man5/make.conf.5 Sun Apr 13 05:22:22 2014 (r264401)
+++ head/share/man/man5/make.conf.5 Sun Apr 13 05:22:26 2014 (r264402)
@@ -434,8 +434,11 @@ Set this to run
.Dq Li "${MAKE} clean"
instead of
.Dq Li "${MAKE} cleandir" .
-.It Va NO_MANCOMPRESS
-.Pq Vt bool
+.It Va WITH_MANCOMPRESS
+.Pq Vt defined
+Set to install manual pages compressed.
+.It Va WITHOUT_MANCOMPRESS
+.Pq Vt defined
Set to install manual pages uncompressed.
.It Va NO_SHARE
.Pq Vt bool
Modified: head/share/mk/bsd.man.mk
==============================================================================
--- head/share/mk/bsd.man.mk Sun Apr 13 05:22:22 2014 (r264401)
+++ head/share/mk/bsd.man.mk Sun Apr 13 05:22:26 2014 (r264402)
@@ -30,9 +30,6 @@
# second, and there may be multiple pairs. The files
# are hard-linked.
#
-# NO_MANCOMPRESS If you do not want unformatted manual pages to be
-# compressed when they are installed. [not set]
-#
# NO_MLINKS If you do not want install manual page links. [not set]
#
# MANFILTER command to pipe the raw man page through before compressing
@@ -77,10 +74,10 @@ MAN+= ${MAN${__sect}}
_manpages:
all-man: _manpages
-.if defined(NO_MANCOMPRESS)
+.if ${MK_MANCOMPRESS} != "no"
# Make special arrangements to filter to a temporary file at build time
-# for NO_MANCOMPRESS.
+# for MK_MANCOMPRESS == no.
.if defined(MANFILTER)
FILTEXTENSION= .filt
.else
@@ -162,7 +159,7 @@ maninstall: _maninstall
_maninstall:
.if defined(MAN) && !empty(MAN)
_maninstall: ${MAN}
-.if defined(NO_MANCOMPRESS)
+.if ${MK_MANCOMPRESS} == "no"
.if defined(MANFILTER)
.for __page in ${MAN}
${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Sun Apr 13 05:22:22 2014 (r264401)
+++ head/share/mk/bsd.own.mk Sun Apr 13 05:22:26 2014 (r264402)
@@ -301,6 +301,7 @@ __DEFAULT_YES_OPTIONS = \
MAILWRAPPER \
MAKE \
MAN \
+ MANCOMPRESS \
NCURSESW \
NDIS \
NETCAT \
@@ -458,11 +459,14 @@ MK_${var}:= no
# Supported NO_* options (if defined, MK_* will be forced to "no",
# regardless of user's setting).
#
+# These are transitional and will disappaer in the fullness of time.
+#
.for var in \
CTF \
DEBUG_FILES \
INSTALLLIB \
MAN \
+ MANCOMPRESS \
PROFILE
.if defined(NO_${var})
MK_${var}:=no
More information about the svn-src-all
mailing list