summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2013-04-28 17:58:11 +0000
committereadler <eadler@FreeBSD.org>2013-04-28 17:58:11 +0000
commitac784bd1ceb146c2c17f1103f7fa1b9d2b6a5c32 (patch)
treeab829859d62ee3f5a87e2c034cd87e3399b9338b /tools
parentf53b49b70c849567dc5a16d77c4dc220f82e382f (diff)
downloadFreeBSD-src-ac784bd1ceb146c2c17f1103f7fa1b9d2b6a5c32.zip
FreeBSD-src-ac784bd1ceb146c2c17f1103f7fa1b9d2b6a5c32.tar.gz
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
Diffstat (limited to 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index ae0a4e0..c5e92da 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3674,9 +3674,9 @@ OLD_FILES+=usr/share/man/man8/ntptime.8.gz
# 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
OpenPOWER on IntegriCloud