diff options
| author | Kip Macy <kmacy@FreeBSD.org> | 2009-06-05 12:00:55 +0000 |
|---|---|---|
| committer | Kip Macy <kmacy@FreeBSD.org> | 2009-06-05 12:00:55 +0000 |
| commit | 95ab4da810f0ce9948ef2d619ed86a4807e28ecd (patch) | |
| tree | 6fe4999fd4d3f35dd24a2a7b39f72b8dade2a5eb /sys/boot | |
| parent | 5cc7444d2e3c89af2da4de85ee450e181b1c8aee (diff) | |
Notes
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sys/boot/Makefile b/sys/boot/Makefile index 70342bbc8a3a..d790788e64af 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -17,7 +17,7 @@ SUBDIR+= efi SUBDIR+= ofw .endif -.if defined(LOADER_ZFS_SUPPORT) +.if ${MK_ZFS} != "no" SUBDIR+= zfs .endif diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile index 176384bdf1ed..8fc561e94f02 100644 --- a/sys/boot/i386/Makefile +++ b/sys/boot/i386/Makefile @@ -3,7 +3,7 @@ SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ kgzldr libi386 libfirewire loader -.if defined(LOADER_ZFS_SUPPORT) +.if ${MK_ZFS} != "no" SUBDIR+= zfsboot gptzfsboot .endif diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index eb62de1b9295..e0d600f30c4a 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -15,8 +15,7 @@ CFLAGS+= -DLOADER_FIREWIRE_SUPPORT LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a .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 |