Date: Wed, 10 Jun 2009 09:06:42 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r193890 - in stable/7/sys/boot: . i386 Message-ID: <200906100906.n5A96grD099416@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Wed Jun 10 09:06:42 2009 New Revision: 193890 URL: http://svn.freebsd.org/changeset/base/193890 Log: fix loader for default settings case Modified: stable/7/sys/boot/Makefile stable/7/sys/boot/i386/Makefile Modified: stable/7/sys/boot/Makefile ============================================================================== --- stable/7/sys/boot/Makefile Wed Jun 10 06:49:45 2009 (r193889) +++ stable/7/sys/boot/Makefile Wed Jun 10 09:06:42 2009 (r193890) @@ -17,7 +17,7 @@ SUBDIR+= efi SUBDIR+= ofw .endif -.if defined(LOADER_ZFS_SUPPORT) +.if ${MK_ZFS} != "no" SUBDIR+= zfs .endif Modified: stable/7/sys/boot/i386/Makefile ============================================================================== --- stable/7/sys/boot/i386/Makefile Wed Jun 10 06:49:45 2009 (r193889) +++ stable/7/sys/boot/i386/Makefile Wed Jun 10 09:06:42 2009 (r193890) @@ -2,11 +2,7 @@ .include <bsd.own.mk> SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ - kgzldr libi386 libfirewire loader - -.if ${MK_ZFS} != "no" -SUBDIR+= zfsboot gptzfsboot -.endif + zfsboot gptzfsboot kgzldr libi386 libfirewire loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906100906.n5A96grD099416>