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

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
 

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

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