d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When the world is built WITHOUT_OPENSSH also don't

Browse Source 
install ssh-copy-id.

PR:		misc/177590
Submitted by:	Oleg Ginzburg <olevole@olevole.ru>
Reviewed by:	imp
This commit is contained in:
Eitan Adler 2013-04-28 17:58:11 +00:00
parent a532cafd5e
commit b4634967f0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -3674,9 +3674,9 @@ OLD_FILES+=usr/share/man/man8/ntptime.8.gz
# to be filled in # to be filled in
#.endif #.endif
#.if ${MK_OPENSSH} == no .if ${MK_OPENSSH} == no
# to be filled in OLD_FILES+=usr.bin/ssh-copy-id
#.endif .endif
#.if ${MK_OPENSSL} == no #.if ${MK_OPENSSL} == no
# to be filled in # to be filled in

5
usr.bin/Makefile
View File

@ -148,7 +148,6 @@ SUBDIR= alias \
sockstat \ sockstat \
sort \ sort \
split \ split \
ssh-copy-id \
stat \ stat \
stdbuf \ stdbuf \
su \ su \
@ -303,6 +302,10 @@ SUBDIR+= ypmatch
SUBDIR+= ypwhich SUBDIR+= ypwhich
.endif .endif
.if ${MK_OPENSSH} != "no"
SUBDIR+= ssh-copy-id
.endif
.if ${MK_OPENSSL} != "no" .if ${MK_OPENSSL} != "no"
SUBDIR+= bc SUBDIR+= bc
SUBDIR+= chkey SUBDIR+= chkey