svn commit: r192667 - in user/kmacy/releng_7_2_fcs/sys/boot: . i386/loader

[Kip Macy]

Author: kmacy
Date: Sat May 23 20:03:34 2009
New Revision: 192667
URL: http://svn.freebsd.org/changeset/base/192667

Log:
  be consistent with the rest of /src and make ZFS loader support opt out
  
  - CDDL contaminates by its presence not by being linked in, this seems
    to be a source of confusion for many

Modified:
  user/kmacy/releng_7_2_fcs/sys/boot/Makefile
  user/kmacy/releng_7_2_fcs/sys/boot/i386/loader/Makefile

Modified: user/kmacy/releng_7_2_fcs/sys/boot/Makefile
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/boot/Makefile	Sat May 23 19:57:11 2009	(r192666)
+++ user/kmacy/releng_7_2_fcs/sys/boot/Makefile	Sat May 23 20:03:34 2009	(r192667)
@@ -17,7 +17,7 @@ SUBDIR+=		efi
 SUBDIR+=		ofw
 .endif
 
-.if defined(LOADER_ZFS_SUPPORT)
+.if ${MK_ZFS} != "no"
 SUBDIR+=		zfs
 .endif
 

Modified: user/kmacy/releng_7_2_fcs/sys/boot/i386/loader/Makefile
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/boot/i386/loader/Makefile	Sat May 23 19:57:11 2009	(r192666)
+++ user/kmacy/releng_7_2_fcs/sys/boot/i386/loader/Makefile	Sat May 23 20:03:34 2009	(r192667)
@@ -16,7 +16,7 @@ LIBFIREWIRE=	${.OBJDIR}/../libfirewire/l
 .endif
 
 # Put LOADER_ZFS_SUPPORT=yes in /etc/make.conf for ZFS support
-.if defined(LOADER_ZFS_SUPPORT)
+.if ${MK_ZFS} != "no"
 CFLAGS+=	-DLOADER_ZFS_SUPPORT
 LIBZFS=		${.OBJDIR}/../../zfs/libzfsboot.a
 .endif