svn commit: r275915 - projects/building-blocks/rescue/rescue

[Garrett Cooper]

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