d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not build (and install) both secure/ and standard versions

Browse Source 
of libtelnet, telnetd, and telnet.  This only worked because
secure/ was listed late in SUBDIR in Makefile.inc1.

Reviewed by:	markm
This commit is contained in:
Ruslan Ermilov 2001-03-26 12:49:05 +00:00
parent aeebb4e76d
commit 0dc44b5add
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile
View File

@ -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

4
libexec/Makefile
View File

@ -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

6
usr.bin/Makefile
View File

@ -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