Date: Sun, 28 Apr 2013 17:58:11 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250024 - in head: tools/build/mk usr.bin Message-ID: <201304281758.r3SHwBCC003180@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Sun Apr 28 17:58:11 2013 New Revision: 250024 URL: http://svnweb.freebsd.org/changeset/base/250024 Log: When the world is built WITHOUT_OPENSSH also don't install ssh-copy-id. PR: misc/177590 Submitted by: Oleg Ginzburg <olevole@olevole.ru> Reviewed by: imp Modified: head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.bin/Makefile Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Apr 28 16:35:24 2013 (r250023) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Apr 28 17:58:11 2013 (r250024) @@ -3674,9 +3674,9 @@ OLD_FILES+=usr/share/man/man8/ntptime.8. # to be filled in #.endif -#.if ${MK_OPENSSH} == no -# to be filled in -#.endif +.if ${MK_OPENSSH} == no +OLD_FILES+=usr.bin/ssh-copy-id +.endif #.if ${MK_OPENSSL} == no # to be filled in Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Sun Apr 28 16:35:24 2013 (r250023) +++ head/usr.bin/Makefile Sun Apr 28 17:58:11 2013 (r250024) @@ -148,7 +148,6 @@ SUBDIR= alias \ sockstat \ sort \ split \ - ssh-copy-id \ stat \ stdbuf \ su \ @@ -303,6 +302,10 @@ SUBDIR+= ypmatch SUBDIR+= ypwhich .endif +.if ${MK_OPENSSH} != "no" +SUBDIR+= ssh-copy-id +.endif + .if ${MK_OPENSSL} != "no" SUBDIR+= bc SUBDIR+= chkey
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304281758.r3SHwBCC003180>