From owner-svn-src-stable@FreeBSD.ORG  Mon May 25 03:06:27 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A569106566C;
	Mon, 25 May 2009 03:06:27 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 77B1D8FC14;
	Mon, 25 May 2009 03:06:27 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4P36Ra1008816;
	Mon, 25 May 2009 03:06:27 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4P36RxQ008815;
	Mon, 25 May 2009 03:06:27 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905250306.n4P36RxQ008815@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 25 May 2009 03:06:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192715 - stable/7/sys/boot/i386
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 May 2009 03:06:28 -0000

Author: kmacy
Date: Mon May 25 03:06:26 2009
New Revision: 192715
URL: http://svn.freebsd.org/changeset/base/192715

Log:
  don't try building zfsboot and gptzfsboot if zfs loader is not enabled

Modified:
  stable/7/sys/boot/i386/Makefile

Modified: stable/7/sys/boot/i386/Makefile
==============================================================================
--- stable/7/sys/boot/i386/Makefile	Mon May 25 02:59:54 2009	(r192714)
+++ stable/7/sys/boot/i386/Makefile	Mon May 25 03:06:26 2009	(r192715)
@@ -1,7 +1,11 @@
 # $FreeBSD$
 
-SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
-		gptzfsboot kgzldr libi386 libfirewire loader
+SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
+		kgzldr libi386 libfirewire loader
+
+.if defined(LOADER_ZFS_SUPPORT)
+SUBDIR+=		zfsboot gptzfsboot
+.endif
 
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr