d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert NO_MANCOMPRESSED to MK_MANCOMPRESSED.

Browse Source
This commit is contained in:
Warner Losh 2014-04-18 17:03:49 +00:00
parent 1bbf66051b
commit 0abe2561f6
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/examples/etc/make.conf
View File

@ -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.

7
share/man/man5/make.conf.5
View File

@ -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

9
share/mk/bsd.man.mk
View File

@ -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} \

3
share/mk/bsd.own.mk
View File

@ -301,6 +301,7 @@ __DEFAULT_YES_OPTIONS = \
MAILWRAPPER \
MAKE \
MAN \
MANCOMPRESS \
NCURSESW \
NDIS \
NETCAT \
@ -459,6 +460,8 @@ 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 \