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

Add a new build option, MAN_UTILS. This option lets you control building

Browse Source 
utilities and related support files for manual pages, which were previously
controlled by MAN.  For POLA, the default depends on MAN, i.e., WITHOUT_MAN
implies WITHOUT_MAN_UTILS and WITH_MAN implies WITH_MAN_UTILS.  This patch
is slightly improved by me from:

PR:		misc/145212
This commit is contained in:
Jung-uk Kim 2010-05-19 23:56:26 +00:00
parent 56b6785885
commit 07e547fe26
7 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/Makefile
View File

@ -64,7 +64,7 @@ BIN1+= hosts.lpd printcap
BIN1+= ${.CURDIR}/../usr.bin/mail/misc/mail.rc
.endif
.if ${MK_MAN} != "no"
.if ${MK_MAN_UTILS} != "no"
BIN1+= ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
.endif

2
etc/periodic/weekly/Makefile
View File

@ -11,7 +11,7 @@ FILES= 340.noid \
FILES+= 310.locate
.endif
.if ${MK_MAN} != "no"
.if ${MK_MAN_UTILS} != "no"
FILES+= 320.whatis 330.catman
.endif

2
gnu/usr.bin/Makefile
View File

@ -39,7 +39,7 @@ _grep= grep
_texinfo= texinfo
.endif
.if ${MK_MAN} != "no"
.if ${MK_MAN_UTILS} != "no"
_man= man
.endif

2
share/man/Makefile
View File

@ -9,10 +9,12 @@ SUBDIR= man1 man3 man4 man5 man6 man7 man8 man9
MAKEWHATIS?= makewhatis
makedb:
.if ${MK_MAN_UTILS} != "no"
${MAKEWHATIS} ${DESTDIR}${BINDIR}/man
.if ${MK_OPENSSL} != "no"
${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man
.endif
.endif
.include "${.CURDIR}/../Makefile.inc"
.include <bsd.subdir.mk>

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

@ -524,7 +524,8 @@ MK_${var}_SUPPORT:= yes
# MK_* options whose default value depends on another option.
#
.for vv in \
GSSAPI/KERBEROS
GSSAPI/KERBEROS \
MAN_UTILS/MAN
.if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H})
.error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set.
.endif

8
usr.bin/Makefile
View File

@ -120,7 +120,7 @@ SUBDIR= alias \
m4 \
${_mail} \
${_make} \
makewhatis \
${_makewhatis} \
mesg \
minigzip \
ministat \
@ -256,7 +256,7 @@ _at= at
_atm= atm
.endif
.if ${MK_MAN} != "no"
.if ${MK_MAN_UTILS} != "no"
_catman= catman
.endif
@ -309,6 +309,10 @@ _msgs= msgs
_make= make
.endif
.if ${MK_MAN_UTILS} != "no"
_makewhatis= makewhatis
.endif
.if ${MK_NETCAT} != "no"
_nc= nc
.endif

6
usr.sbin/Makefile
View File

@ -90,7 +90,7 @@ SUBDIR= ${_ac} \
mailwrapper \
makefs \
${_makemap} \
manctl \
${_manctl} \
memcontrol \
mergemaster \
mfiutil \
@ -322,6 +322,10 @@ _nscd= nscd
_lpr= lpr
.endif
.if ${MK_MAN_UTILS} != "no"
_manctl= manctl
.endif
.if ${MK_NETGRAPH} != "no"
_flowctl= flowctl
_lmcconfig= lmcconfig