diff options
author | ngie <ngie@FreeBSD.org> | 2015-02-11 07:08:32 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-02-11 07:08:32 +0000 |
commit | bf4551aa326eb2d4436b7fc27395c12c5fd7c28b (patch) | |
tree | 014c298a7b5bf94c53d2954853d7eda012b62a35 /share | |
parent | b7391dae4ae82148a179e853c782b7da6f441b70 (diff) | |
download | FreeBSD-src-bf4551aa326eb2d4436b7fc27395c12c5fd7c28b.zip FreeBSD-src-bf4551aa326eb2d4436b7fc27395c12c5fd7c28b.tar.gz |
MFC r277675,r277726,r278070:
r277675:
Add MK_ISCSI knob for building the iscsi initiator, iscsi daemon, kernel
modules, etc
Sponsored by: EMC / Isilon Storage Division
r277726:
Build sbin/iscontrol again if MK_ISCSI != no
Pointyhat to: me
r278070:
Remove duplicate MK_ISCSI block and sort the conditional blocks so this error
won't crop up again in the future
Reported by: gjb
Diffstat (limited to 'share')
-rw-r--r-- | share/man/man4/Makefile | 8 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 9621a71..651172b 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -208,8 +208,6 @@ MAN= aac.4 \ ipw.4 \ ipwfw.4 \ isci.4 \ - iscsi.4 \ - iscsi_initiator.4 \ isp.4 \ ispfw.4 \ iwi.4 \ @@ -861,6 +859,12 @@ _nvram2env.4= nvram2env.4 SUBDIR= man4.${MACHINE_CPUARCH} .endif +.if ${MK_ISCSI} != "no" +MAN+= iscsi.4 +MAN+= iscsi_initiator.4 + +.endif + .if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index e55057e..58b1044 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -297,6 +297,7 @@ __DEFAULT_YES_OPTIONS = \ IPFILTER \ IPFW \ IPX \ + ISCSI \ JAIL \ KDUMP \ KERBEROS \ |