diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-02 10:31:35 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-02 10:31:35 +0000 |
| commit | 9f0ace34fc9e6d9293657f3f8b083d2a852f5b5e (patch) | |
| tree | 384c3bb42de1e49e5f8b625e3bec752ce40deea9 | |
| parent | a2d0d4f6b124196692106e5942910280b1e25348 (diff) | |
| download | FreeBSD-src-9f0ace34fc9e6d9293657f3f8b083d2a852f5b5e.zip FreeBSD-src-9f0ace34fc9e6d9293657f3f8b083d2a852f5b5e.tar.gz | |
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
| -rw-r--r-- | sbin/Makefile | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sbin/Makefile b/sbin/Makefile index 6825cb6..c828b21 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 |
