]> xenbits.xensource.com Git - people/julieng/freebsd.git/commitdiff
Make iscsictl and iscsid build if MK_ISCSI == yes
authorngie <ngie@FreeBSD.org>
Sat, 17 Oct 2015 21:11:42 +0000 (21:11 +0000)
committerngie <ngie@FreeBSD.org>
Sat, 17 Oct 2015 21:11:42 +0000 (21:11 +0000)
MFC after: 1 month
X-MFC with: r289452

rescue/rescue/Makefile

index 4d8b63d0f825b530de1dab11f9eb65714a5c5ce6..45a6cc21165624f53180c3fcbf34040db42c4380 100644 (file)
@@ -179,7 +179,7 @@ CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRUNCH -Dlint
 #
 CRUNCH_SRCDIRS+= usr.bin
 
-CRUNCH_PROGS_usr.bin= head iscsictl mt nc sed tail tee
+CRUNCH_PROGS_usr.bin= head mt nc sed tail tee
 
 CRUNCH_PROGS_usr.bin+= gzip
 CRUNCH_ALIAS_gzip= gunzip gzcat zcat
@@ -214,12 +214,17 @@ CRUNCH_ALIAS_id= groups whoami
 #
 CRUNCH_SRCDIRS+= usr.sbin
 
-CRUNCH_PROGS_usr.sbin+= chroot iscsid
+CRUNCH_PROGS_usr.sbin+= chroot
 
 CRUNCH_PROGS_usr.sbin+= chown
 CRUNCH_ALIAS_chown= chgrp
 ##################################################################
 CRUNCH_LIBS+= -lm
 
+.if ${MK_ISCSI} != "no"
+CRUNCH_PROGS_usr.bin+= iscsictl
+CRUNCH_PROGS_usr.sbin+=        iscsid
+.endif
+
 .include <bsd.crunchgen.mk>
 .include <bsd.prog.mk>