svn commit: r237759 - stable/8/sys/boot/i386/loader

[Andriy Gapon]

Author: avg
Date: Fri Jun 29 10:07:16 2012
New Revision: 237759
URL: http://svn.freebsd.org/changeset/base/237759

Log:
  MFC r235156: i386 zfsloader: rename LIBZFS to LIBZFSBOOT

Modified:
  stable/8/sys/boot/i386/loader/Makefile
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)

Modified: stable/8/sys/boot/i386/loader/Makefile
==============================================================================
--- stable/8/sys/boot/i386/loader/Makefile	Fri Jun 29 10:06:37 2012	(r237758)
+++ stable/8/sys/boot/i386/loader/Makefile	Fri Jun 29 10:07:16 2012	(r237759)
@@ -20,9 +20,7 @@ LIBFIREWIRE=	${.OBJDIR}/../libfirewire/l
 # Set by zfsloader Makefile
 .if defined(LOADER_ZFS_SUPPORT)
 CFLAGS+=	-DLOADER_ZFS_SUPPORT
-LIBZFS=		${.OBJDIR}/../../zfs/libzfsboot.a
-.else
-LIBZFS=
+LIBZFSBOOT=	${.OBJDIR}/../../zfs/libzfsboot.a
 .endif
 
 # Enable PXE TFTP or NFS support, not both.
@@ -114,8 +112,8 @@ FILES+=	loader.rc
 # XXX crt0.o needs to be first for pxeboot(8) to work
 OBJS=	${BTXCRT} 
 
-DPADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}
-LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} -lstand
+DPADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
+LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} -lstand
 
 .include <bsd.prog.mk>