svn commit: r262495 - head/sys/boot/userboot/userboot

[Sean Bruno]

Author: sbruno
Date: Tue Feb 25 21:07:18 2014
New Revision: 262495
URL: http://svnweb.freebsd.org/changeset/base/262495

Log:
  Slightly better revision of teaching userboot how to respect MK_CDDL
  
  Reviewed by:	grehan

Modified:
  head/sys/boot/userboot/userboot/Makefile

Modified: head/sys/boot/userboot/userboot/Makefile
==============================================================================
--- head/sys/boot/userboot/userboot/Makefile	Tue Feb 25 21:01:55 2014	(r262494)
+++ head/sys/boot/userboot/userboot/Makefile	Tue Feb 25 21:07:18 2014	(r262495)
@@ -51,11 +51,11 @@ LIBFICL=	${.OBJDIR}/../ficl/libficl.a
 LIBSTAND=	${.OBJDIR}/../libstand/libstand.a
 .endif
 
-.if ${MK_CDDL} != "no"
 .if ${MK_ZFS} != "no"
 CFLAGS+=	-DUSERBOOT_ZFS_SUPPORT
 LIBZFS=		${.OBJDIR}/../zfs/libzfsboot.a
-.endif
+DPADD=		${LIBZFS}
+LDADD=		${LIBZFS}
 .endif
 
 # Always add MI sources 
@@ -63,7 +63,7 @@ LIBZFS=		${.OBJDIR}/../zfs/libzfsboot.a
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I.
-DPADD=		${LIBFICL} ${LIBZFS} ${LIBSTAND} 
-LDADD=		${LIBFICL} ${LIBZFS} ${LIBSTAND}
+DPADD+=		${LIBFICL} ${LIBSTAND} 
+LDADD+=		${LIBFICL} ${LIBSTAND}
 
 .include <bsd.lib.mk>