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 /sbin | |
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 'sbin')
-rw-r--r-- | sbin/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sbin/Makefile b/sbin/Makefile index cad3219..f28d311 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -35,7 +35,6 @@ SUBDIR=adjkerntz \ hastd \ ifconfig \ init \ - iscontrol \ kldconfig \ kldload \ kldstat \ @@ -82,6 +81,11 @@ SUBDIR+= atm SUBDIR+= devd .endif +.if ${MK_INET6} != "no" +SUBDIR+= ping6 +SUBDIR+= rtsol +.endif + .if ${MK_IPFILTER} != "no" SUBDIR+= ipf .endif @@ -91,6 +95,10 @@ SUBDIR+= ipfw SUBDIR+= natd .endif +.if ${MK_ISCSI} != "no" +SUBDIR+= iscontrol +.endif + .if ${MK_NAND} != "no" SUBDIR+= nandfs SUBDIR+= newfs_nandfs @@ -101,11 +109,6 @@ SUBDIR+= pfctl SUBDIR+= pflogd .endif -.if ${MK_INET6} != "no" -SUBDIR+= ping6 -SUBDIR+= rtsol -.endif - .if ${MK_QUOTAS} != "no" SUBDIR+= quotacheck .endif |