summaryrefslogtreecommitdiffstats
path: root/usr.bin/Makefile
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2001-03-26 12:49:05 +0000
committerru <ru@FreeBSD.org>2001-03-26 12:49:05 +0000
commit543d4969833536e702250d65bb8f821f6d36c733 (patch)
treeb2b90434d1b4b29e5f45fca0641fdaeb52fb370c /usr.bin/Makefile
parentf2a28122a4e1621aba95eb9a33bd52cb31bb2513 (diff)
downloadFreeBSD-src-543d4969833536e702250d65bb8f821f6d36c733.zip
FreeBSD-src-543d4969833536e702250d65bb8f821f6d36c733.tar.gz
Do not build (and install) both secure/ and standard versions
of libtelnet, telnetd, and telnet. This only worked because secure/ was listed late in SUBDIR in Makefile.inc1. Reviewed by: markm
Diffstat (limited to 'usr.bin/Makefile')
-rw-r--r--usr.bin/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index e277a30..58ce7e1 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
OpenPOWER on IntegriCloud