diff options
| author | ru <ru@FreeBSD.org> | 2003-04-30 07:24:35 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-04-30 07:24:35 +0000 |
| commit | 13592a98889945f4cdea699b8603007f034b4f8e (patch) | |
| tree | a043fd521a44cceca31d53c7f2283986b318acb1 | |
| parent | b4e11fe3020bbda14f734e4aca616719e15fc6c6 (diff) | |
| download | FreeBSD-src-13592a98889945f4cdea699b8603007f034b4f8e.zip FreeBSD-src-13592a98889945f4cdea699b8603007f034b4f8e.tar.gz | |
Don't clobber Kerberos5 telnet(1) and telnetd(8) with non-crypto versions.
| -rw-r--r-- | libexec/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/Makefile | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index 61f76e3..aa3f26f 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -38,10 +38,10 @@ SUBDIR+=named-xfer SUBDIR+=mail.local smrsh .endif - .if defined(RELEASEDIR) || \ - (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \ - defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4)) + (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ + defined(NOCRYPT) || \ + (defined(NOSECURE) && !defined(MAKE_KERBEROS5)) # make release needs both SUBDIR+=telnetd .endif diff --git a/usr.bin/Makefile b/usr.bin/Makefile index ea43e55..a4d7632 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -217,9 +217,10 @@ SUBDIR= alias \ ypwhich .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. + (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ + defined(NOCRYPT) || \ + (defined(NOSECURE) && !defined(MAKE_KERBEROS5)) +# make release needs both SUBDIR+=telnet .endif |
