diff options
| author | ru <ru@FreeBSD.org> | 2001-03-26 12:49:05 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2001-03-26 12:49:05 +0000 |
| commit | 543d4969833536e702250d65bb8f821f6d36c733 (patch) | |
| tree | b2b90434d1b4b29e5f45fca0641fdaeb52fb370c | |
| parent | f2a28122a4e1621aba95eb9a33bd52cb31bb2513 (diff) | |
| download | FreeBSD-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
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | libexec/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/Makefile | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/Makefile b/lib/Makefile index ae9f0fb..1ff9da1 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 6ee31ed..6e1915b 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 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 |
