Introduce NO_RCMNDS flag so as to not compile rsh, rlogin, and rcp on will,

and document in share/examples/etc/make.conf

Submitted by: Aleksandar Simic <asimic@dsl.pipex.com>
MFC after: 1 week

3 files changed, 10 insertions, 3 deletions

diff --git a/bin/Makefile b/bin/Makefile
index 8c3bf23..e213851 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -22,7 +22,6 @@ SUBDIR= cat \
 	pax \
 	ps \
 	pwd \
-	rcp \
 	realpath \
 	rm \
 	rmdir \
@@ -33,6 +32,10 @@ SUBDIR= cat \
 	sync \
 	test
 
+.if !defined(NO_RCMNDS)
+SUBDIR+=rcp
+.endif
+
 .if !defined(NO_TCSH)
 SUBDIR+=csh
 .endif
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index ca6b375..cffcaa7 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -116,6 +116,7 @@
 #NOSECURE=	true	# do not build crypto code in secure/ subdir
 #NOSHARE=	true	# do not go into the share subdir
 #NOUUCP=	true	# do not build uucp related programs
+#NO_RCMNDS=	true	# do not build rlogin, rsh & rcp
 #
 # To build the OpenSSL manpages, uncomment the following.  These are not
 # built by default because they clobber a number of system manpages with
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 935fd98..18b7dc5 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -121,11 +121,9 @@ SUBDIR=	apply \
 	quota \
 	renice \
 	rev \
-	rlogin \
 	rpcgen \
 	rpcinfo \
 	rs \
-	rsh \
 	rup \
 	ruptime \
 	rusers \
@@ -230,6 +228,11 @@ SUBDIR+=ar \
 SUBDIR+=uac
 .endif
 
+.if !defined(NO_RCMNDS)
+SUBDIR+=rlogin \
+	rsh
+.endif
+
 # Things which don't compile on new platforms yet:
 .if ${MACHINE_ARCH} != "sparc64" && ${MACHINE_ARCH} != "ia64"
 SUBDIR+=xlint