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

Convert NO_MANCOMPRESS to normal convention.

Browse Source
This commit is contained in:
Warner Losh 2014-04-13 05:22:26 +00:00
parent 0b8951c562
commit 5bce97114a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=264402
4 changed files with 13 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 # If you do not want unformatted manual pages to be compressed
# when they are installed: # when they are installed:
# #
#NO_MANCOMPRESS= #WITHOUT_MANCOMPRESS=t
# #
# #
# Default format for system documentation, depends on your printer. # 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" .Dq Li "${MAKE} clean"
instead of instead of
.Dq Li "${MAKE} cleandir" . .Dq Li "${MAKE} cleandir" .
.It Va NO_MANCOMPRESS .It Va WITH_MANCOMPRESS
.Pq Vt bool .Pq Vt defined
Set to install manual pages compressed.
.It Va WITHOUT_MANCOMPRESS
.Pq Vt defined
Set to install manual pages uncompressed. Set to install manual pages uncompressed.
.It Va NO_SHARE .It Va NO_SHARE
.Pq Vt bool .Pq Vt bool

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

@ -30,9 +30,6 @@
# second, and there may be multiple pairs. The files # second, and there may be multiple pairs. The files
# are hard-linked. # 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] # NO_MLINKS If you do not want install manual page links. [not set]
# #
# MANFILTER command to pipe the raw man page through before compressing # MANFILTER command to pipe the raw man page through before compressing
@ -77,10 +74,10 @@ MAN+= ${MAN${__sect}}
_manpages: _manpages:
all-man: _manpages all-man: _manpages
.if defined(NO_MANCOMPRESS) .if ${MK_MANCOMPRESS} != "no"
# Make special arrangements to filter to a temporary file at build time # Make special arrangements to filter to a temporary file at build time
# for NO_MANCOMPRESS. # for MK_MANCOMPRESS == no.
.if defined(MANFILTER) .if defined(MANFILTER)
FILTEXTENSION= .filt FILTEXTENSION= .filt
.else .else
@ -162,7 +159,7 @@ maninstall: _maninstall
_maninstall: _maninstall:
.if defined(MAN) && !empty(MAN) .if defined(MAN) && !empty(MAN)
_maninstall: ${MAN} _maninstall: ${MAN}
.if defined(NO_MANCOMPRESS) .if ${MK_MANCOMPRESS} == "no"
.if defined(MANFILTER) .if defined(MANFILTER)
.for __page in ${MAN} .for __page in ${MAN}
${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \

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

@ -301,6 +301,7 @@ __DEFAULT_YES_OPTIONS = \
MAILWRAPPER \ MAILWRAPPER \
MAKE \ MAKE \
MAN \ MAN \
MANCOMPRESS \
NCURSESW \ NCURSESW \
NDIS \ NDIS \
NETCAT \ NETCAT \
@ -458,11 +459,14 @@ MK_${var}:= no
# Supported NO_* options (if defined, MK_* will be forced to "no", # Supported NO_* options (if defined, MK_* will be forced to "no",
# regardless of user's setting). # regardless of user's setting).
# #
# These are transitional and will disappaer in the fullness of time.
#
.for var in \ .for var in \
CTF \ CTF \
DEBUG_FILES \ DEBUG_FILES \
INSTALLLIB \ INSTALLLIB \
MAN \ MAN \
MANCOMPRESS \
PROFILE PROFILE
.if defined(NO_${var}) .if defined(NO_${var})
MK_${var}:=no MK_${var}:=no