From ee89f3d53c0401f6a3d4c6a2dd120a31fb402e60 Mon Sep 17 00:00:00 2001
From: Peter Grehan <grehan@FreeBSD.org>
Date: Wed, 26 Feb 2014 04:49:09 +0000
Subject: [PATCH] Change the MK_ZFS != "no" case slightly to avoid a name clash
 with LIBZFS in bsd.lib.mk

Submitted by:	Max N Boyarov   zotrix at bsd dot by
OK'd by:	sbruno
---
 sys/boot/userboot/userboot/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sys/boot/userboot/userboot/Makefile b/sys/boot/userboot/userboot/Makefile
index 26757dff1b9..aad2e0f83c3 100644
--- a/sys/boot/userboot/userboot/Makefile
+++ b/sys/boot/userboot/userboot/Makefile
@@ -53,9 +53,7 @@ LIBSTAND=	${.OBJDIR}/../libstand/libstand.a
 
 .if ${MK_ZFS} != "no"
 CFLAGS+=	-DUSERBOOT_ZFS_SUPPORT
-LIBZFS=		${.OBJDIR}/../zfs/libzfsboot.a
-DPADD=		${LIBZFS}
-LDADD=		${LIBZFS}
+LIBZFSBOOT=	${.OBJDIR}/../zfs/libzfsboot.a
 .endif
 
 # Always add MI sources 
@@ -63,7 +61,7 @@ LDADD=		${LIBZFS}
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I.
-DPADD+=		${LIBFICL} ${LIBSTAND} 
-LDADD+=		${LIBFICL} ${LIBSTAND}
+DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} 
+LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND}
 
 .include <bsd.lib.mk>