svn commit: r275304 - in projects/building-blocks: sbin tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Sun Nov 30 08:34:46 2014
New Revision: 275304
URL: https://svnweb.freebsd.org/changeset/base/275304

Log:
  Build spppcontrol if MK_PPP != no

Modified:
  projects/building-blocks/sbin/Makefile
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc

Modified: projects/building-blocks/sbin/Makefile
==============================================================================
--- projects/building-blocks/sbin/Makefile	Sun Nov 30 06:48:37 2014	(r275303)
+++ projects/building-blocks/sbin/Makefile	Sun Nov 30 08:34:46 2014	(r275304)
@@ -65,7 +65,6 @@ SUBDIR=adjkerntz \
 	savecore \
 	setkey \
 	shutdown \
-	spppcontrol \
 	swapon \
 	sysctl \
 	tunefs \
@@ -111,6 +110,10 @@ SUBDIR+=	pfctl
 SUBDIR+=	pflogd
 .endif
 
+.if ${MK_PPP} != "no"
+SUBDIR+=	spppcontrol
+.endif
+
 .if ${MK_INET6} != "no"
 SUBDIR+=	ping6
 SUBDIR+=	rtsol

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Sun Nov 30 06:48:37 2014	(r275303)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Sun Nov 30 08:34:46 2014	(r275304)
@@ -4682,10 +4682,12 @@ OLD_DIRS+=etc/ppp
 OLD_FILES+=etc/rc.d/ppp
 OLD_FILES+=etc/rc.d/pppoed
 OLD_FILES+=etc/rc.d/sppp
+OLD_FILES+=sbin/spppcontrol
 OLD_FILES+=usr/sbin/ppp
 OLD_FILES+=usr/sbin/pppctl
 OLD_FILES+=usr/share/man/man8/ppp.8.gz
 OLD_FILES+=usr/share/man/man8/pppctl.8.gz
+OLD_FILES+=usr/share/man/man8/spppcontrol.8.gz
 .endif
 
 .if ${MK_PROFILE} == no