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 /usr.bin/Makefile | |
| 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 'usr.bin/Makefile')
| -rw-r--r-- | usr.bin/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 224f3e7..3ac348c 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -66,7 +66,6 @@ SUBDIR= alias \ id \ ipcrm \ ipcs \ - iscsictl \ join \ jot \ ${_kdump} \ @@ -253,6 +252,10 @@ _mkcsmapper= mkcsmapper _mkesdb= mkesdb .endif +.if ${MK_ISCSI} != "no" +SUBDIR+= iscsictl +.endif + .if ${MK_KDUMP} != "no" SUBDIR+= kdump SUBDIR+= truss |
