From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 18 19:02:26 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2F70B5A9;
 Thu, 18 Dec 2014 19:02:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1C29D2F00;
 Thu, 18 Dec 2014 19:02:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBIJ2Pf8024989;
 Thu, 18 Dec 2014 19:02:25 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBIJ2P0S024988;
 Thu, 18 Dec 2014 19:02:25 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201412181902.sBIJ2P0S024988@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 18 Dec 2014 19:02:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275915 - projects/building-blocks/rescue/rescue
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Dec 2014 19:02:26 -0000

Author: ngie
Date: Thu Dec 18 19:02:25 2014
New Revision: 275915
URL: https://svnweb.freebsd.org/changeset/base/275915

Log:
  Conditionally build ex, routed, rtquery, and vi support into rescue, based on
  their respective MK_ flags

Modified:
  projects/building-blocks/rescue/rescue/Makefile

Modified: projects/building-blocks/rescue/rescue/Makefile
==============================================================================
--- projects/building-blocks/rescue/rescue/Makefile	Thu Dec 18 18:59:26 2014	(r275914)
+++ projects/building-blocks/rescue/rescue/Makefile	Thu Dec 18 19:02:25 2014	(r275915)
@@ -97,7 +97,7 @@ CRUNCH_PROGS_sbin= badsect					\
 	mount_msdosfs mount_nfs mount_nullfs			\
 	mount_udf mount_unionfs newfs				\
 	newfs_msdos nos-tun ping reboot				\
-	restore rcorder route routed rtquery rtsol savecore	\
+	restore rcorder route rtsol savecore	\
 	spppcontrol swapon sysctl tunefs umount
 
 .if ${MK_ATM} != "no"
@@ -111,6 +111,9 @@ CRUNCH_PROGS_sbin+= ping6
 .if ${MK_IPFILTER} != "no"
 CRUNCH_PROGS_sbin+= ipf
 .endif
+.if ${MK_ROUTED} != "no"
+CRUNCH_PROGS_sbin+= routed rtquery
+.endif
 .if ${MK_ZFS} != "no"
 CRUNCH_PROGS_sbin+= zfs
 CRUNCH_PROGS_sbin+= zpool
@@ -199,8 +202,10 @@ CRUNCH_LIBS+= -lcrypto
 .endif
 CRUNCH_LIBS+= -lmd
 
+.if ${MK_VI} != "no"
 CRUNCH_PROGS_usr.bin+= vi
 CRUNCH_ALIAS_vi= ex
+.endif
 
 CRUNCH_PROGS_usr.bin+= id
 CRUNCH_ALIAS_id= groups whoami