diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2015-02-02 10:31:35 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2015-02-02 10:31:35 +0000 |
| commit | 87d352d5c6625ac9d548a8d41838ed1589bf9f5b (patch) | |
| tree | 384c3bb42de1e49e5f8b625e3bec752ce40deea9 /sbin/Makefile | |
| parent | 851d8eaaa4e362989d5b737f067e89253744f3d1 (diff) | |
| download | src-87d352d5c6625ac9d548a8d41838ed1589bf9f5b.tar.gz src-87d352d5c6625ac9d548a8d41838ed1589bf9f5b.zip | |
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
Notes
Notes:
svn path=/head/; revision=278070
Diffstat (limited to 'sbin/Makefile')
| -rw-r--r-- | sbin/Makefile | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sbin/Makefile b/sbin/Makefile index 6825cb65afb6..c828b21145f8 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -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 |