From owner-svn-src-all@FreeBSD.ORG  Wed Feb 26 04:49:09 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9883A1FE;
 Wed, 26 Feb 2014 04:49:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 849DF18E9;
 Wed, 26 Feb 2014 04:49:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q4n9FH006976;
 Wed, 26 Feb 2014 04:49:09 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q4n9G8006975;
 Wed, 26 Feb 2014 04:49:09 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201402260449.s1Q4n9G8006975@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Wed, 26 Feb 2014 04:49:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262523 - head/sys/boot/userboot/userboot
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Feb 2014 04:49:09 -0000

Author: grehan
Date: Wed Feb 26 04:49:09 2014
New Revision: 262523
URL: http://svnweb.freebsd.org/changeset/base/262523

Log:
  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

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

Modified: head/sys/boot/userboot/userboot/Makefile
==============================================================================
--- head/sys/boot/userboot/userboot/Makefile	Wed Feb 26 03:26:00 2014	(r262522)
+++ head/sys/boot/userboot/userboot/Makefile	Wed Feb 26 04:49:09 2014	(r262523)
@@ -53,9 +53,7 @@ LIBSTAND=	${.OBJDIR}/../libstand/libstan
 
 .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>