summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--secure/lib/Makefile6
-rw-r--r--secure/libexec/Makefile11
-rw-r--r--secure/usr.bin/Makefile6
3 files changed, 13 insertions, 10 deletions
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index 48121bd..9c8856d 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -1,14 +1,14 @@
# $FreeBSD$
SUBDIR= libcipher
-.if !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
-SUBDIR+=libtelnet
-.endif
.if !defined(NO_OPENSSL)
SUBDIR+=libcrypto libssl
.if !defined(NO_OPENSSH)
SUBDIR+=libssh
.endif
+.if !defined(MAKE_KERBEROS5)
+SUBDIR+=libtelnet
+.endif
.endif
.include <bsd.subdir.mk>
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index 16f8b89..5a3f79d 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -1,10 +1,13 @@
# $FreeBSD$
-.if !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
-SUBDIR= telnetd
-.endif
-.if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
+SUBDIR=
+.if !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSH)
SUBDIR+=sftp-server ssh-keysign
.endif
+.if !defined(MAKE_KERBEROS5)
+SUBDIR+=telnetd
+.endif
+.endif
.include <bsd.subdir.mk>
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index 6be66f4..a6bf02b 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -1,14 +1,14 @@
# $FreeBSD$
SUBDIR= bdes
-.if !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
-SUBDIR+=telnet
-.endif
.if !defined(NO_OPENSSL)
SUBDIR+=openssl
.if !defined(NO_OPENSSH)
SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
.endif
+.if !defined(MAKE_KERBEROS5)
+SUBDIR+=telnet
+.endif
.endif
.include <bsd.subdir.mk>
OpenPOWER on IntegriCloud