Remove duplicate MK_ISCSI block and sort the conditional blocks so this error

won't crop up again in the future

Reported by: gjb
MFC after: 1 week
This commit is contained in:
Enji Cooper 2015-02-02 10:31:35 +00:00
parent 851d8eaaa4
commit 87d352d5c6

View File

@ -91,6 +91,11 @@ SUBDIR+= hastctl
SUBDIR+= hastd
.endif
.if ${MK_INET6} != "no"
SUBDIR+= ping6
SUBDIR+= rtsol
.endif
.if ${MK_IPFILTER} != "no"
SUBDIR+= ipf
.endif
@ -114,15 +119,6 @@ SUBDIR+= pfctl
SUBDIR+= pflogd
.endif
.if ${MK_INET6} != "no"
SUBDIR+= ping6
SUBDIR+= rtsol
.endif
.if ${MK_ISCSI} != "no"
SUBDIR+= iscontrol
.endif
.if ${MK_QUOTAS} != "no"
SUBDIR+= quotacheck
.endif