diff options
| author | trhodes <trhodes@FreeBSD.org> | 2005-03-02 11:53:22 +0000 |
|---|---|---|
| committer | trhodes <trhodes@FreeBSD.org> | 2005-03-02 11:53:22 +0000 |
| commit | 792676bbc2c9c56a3676ca814cde9deb96a83da8 (patch) | |
| tree | a8ef58078677e0c51a13aeead6bffc5d16d6fc2c | |
| parent | 271a50396925d26b7554c390da5882b7ad4c3399 (diff) | |
| download | FreeBSD-src-792676bbc2c9c56a3676ca814cde9deb96a83da8.zip FreeBSD-src-792676bbc2c9c56a3676ca814cde9deb96a83da8.tar.gz | |
Wrap BSD r* commands in NO_RCMDS.
Change NO_RCMDNS to NO_RCMDS and do the switch in bsd.compat.mk.
Discussed with: ru, nectar
| -rw-r--r-- | bin/Makefile | 2 | ||||
| -rw-r--r-- | libexec/Makefile | 12 | ||||
| -rw-r--r-- | rescue/rescue/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/bsd.compat.mk | 1 | ||||
| -rw-r--r-- | usr.bin/Makefile | 9 |
5 files changed, 19 insertions, 7 deletions
diff --git a/bin/Makefile b/bin/Makefile index 86998bd..a56de99 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -37,7 +37,7 @@ SUBDIR= cat \ sync \ test -.if !defined(NO_RCMNDS) +.if !defined(NO_RCMDS) _rcp= rcp .endif diff --git a/libexec/Makefile b/libexec/Makefile index 56919cf..defc296 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -16,14 +16,14 @@ SUBDIR= atrun \ pt_chown \ rbootd \ revnetgroup \ - rexecd \ - rlogind \ + ${_rexecd} \ + ${_rlogind} \ rpc.rquotad \ rpc.rstatd \ rpc.rusersd \ rpc.rwalld \ rpc.sprayd \ - rshd \ + ${_rshd} \ ${_rtld-elf} \ save-entropy \ ${_smrsh} \ @@ -46,6 +46,12 @@ _ftp-proxy= ftp-proxy _rtld-elf= rtld-elf .endif +.if !defined(NO_RCMDS) +_rexecd= rexecd +_logind= rlogind +_rshd= rshd +.endif + .if !defined(NO_SENDMAIL) _mail.local= mail.local _smrsh= smrsh diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index ee43a38..24278d3 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -81,7 +81,7 @@ CRUNCH_ALIAS_ln= link CRUNCH_ALIAS_rm= unlink CRUNCH_ALIAS_ed= red -.if !defined(NO_RCMNDS) +.if !defined(NO_RCMDS) CRUNCH_PROGS_bin+= rcp .endif diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 91d46c2..d7eada6 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -26,6 +26,7 @@ NOPAM:NO_PAM \ NOPIC:NO_PIC \ NOPROFILE:NO_PROFILE \ + NO_RCMNDS:NO_RCMDS \ NOSHARE:NO_SHARE \ NOSHARED:NO_SHARED \ NOTAGS:NO_TAGS diff --git a/usr.bin/Makefile b/usr.bin/Makefile index fbe4e45..824260e 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -147,11 +147,11 @@ SUBDIR= alias \ quota \ renice \ rev \ - rlogin \ + ${_rlogin} \ rpcgen \ rpcinfo \ rs \ - rsh \ + ${_rsh} \ rup \ ruptime \ rusers \ @@ -261,6 +261,11 @@ _ypmatch= ypmatch _ypwhich= ypwhich .endif +.if !defined(NO_RCMDS) +_rlogin= rlogin +_rsh= rsh +.endif + .if !defined(NO_SENDMAIL) _vacation= vacation .endif |
