diff options
| author | jkim <jkim@FreeBSD.org> | 2010-05-19 23:56:26 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-05-19 23:56:26 +0000 |
| commit | af364f655a42923777c35e464291c853aaeb196f (patch) | |
| tree | f2b8d9c39ec13545accae0a0ea0f50a8a1a7dc03 | |
| parent | 0771bb84c54346d9e3a038665a8b9a5821717f32 (diff) | |
| download | FreeBSD-src-af364f655a42923777c35e464291c853aaeb196f.zip FreeBSD-src-af364f655a42923777c35e464291c853aaeb196f.tar.gz | |
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. This patch
is slightly improved by me from:
PR: misc/145212
| -rw-r--r-- | etc/Makefile | 2 | ||||
| -rw-r--r-- | etc/periodic/weekly/Makefile | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/Makefile | 2 | ||||
| -rw-r--r-- | share/man/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 3 | ||||
| -rw-r--r-- | usr.bin/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 6 |
7 files changed, 18 insertions, 7 deletions
diff --git a/etc/Makefile b/etc/Makefile index d8619af..6a2a4d3 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile index fb8cf72..7f2eae2 100644 --- a/etc/periodic/weekly/Makefile +++ b/etc/periodic/weekly/Makefile @@ -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 diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 18add27..17ee26f 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -39,7 +39,7 @@ _grep= grep _texinfo= texinfo .endif -.if ${MK_MAN} != "no" +.if ${MK_MAN_UTILS} != "no" _man= man .endif 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 diff --git a/usr.bin/Makefile b/usr.bin/Makefile index a0e67e2..2956445 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -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 diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index c47ef76..045cb05 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -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 |
