aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile2
-rw-r--r--libexec/Makefile4
-rw-r--r--usr.bin/Makefile6
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/Makefile b/lib/Makefile
index ae9f0fb2c33b..1ff9da177c69 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -58,7 +58,7 @@ _compat= compat
.if defined(RELEASEDIR) || \
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \
- defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
+ defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4))
_libtelnet= libtelnet
.endif
diff --git a/libexec/Makefile b/libexec/Makefile
index 6ee31ed4ab73..6e1915bb4448 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -48,7 +48,9 @@ SUBDIR+=rtld-aout
SUBDIR+=rtld-elf
.endif
-.if defined(RELEASEDIR) || (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
+.if defined(RELEASEDIR) || \
+ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \
+ defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4))
# make release needs both
SUBDIR+=telnetd
.endif
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index e277a300c775..58ce7e1918da 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -198,9 +198,9 @@ SUBDIR= apply \
ypmatch \
ypwhich
-.if defined(RELEASEDIR) || (!exists(${.CURDIR}/../kerberosIV) && \
- !exists(${.CURDIR}/../secure)) || defined(NOCRYPT) || \
- !defined(MAKE_KERBEROS4)
+.if defined(RELEASEDIR) || \
+ (!exists(${.CURDIR}/../kerberosIV) && !exists(${.CURDIR}/../secure)) || \
+ defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4))
# Releases need both this non-crypt telnet and the crypt telnet.
SUBDIR+=telnet
.endif