diff options
| author | jkim <jkim@FreeBSD.org> | 2010-05-25 20:16:36 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-05-25 20:16:36 +0000 |
| commit | aec939697631599c4eed310c30d19b6c8de568e3 (patch) | |
| tree | 48cf4ac268ace3ace66e92dd7f597d425ed2937c /share | |
| parent | 7304692e617d7bac26ec574745838213980a320e (diff) | |
| download | FreeBSD-src-aec939697631599c4eed310c30d19b6c8de568e3.zip FreeBSD-src-aec939697631599c4eed310c30d19b6c8de568e3.tar.gz | |
MFC: r208320
Add a new build option, MAN_UTILS. This option lets you control building
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.
Note this patch implicitly fixes a documentation bug of src.conf(5), which
says WITHOUT_MAN may be used to not build manual pages while it was also
disabling some utilities for manual pages.
Approved by: re (kib)
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/share/man/Makefile b/share/man/Makefile index f1929dc..524235c 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -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> diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 777ff36..f320694 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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 |
