diff options
| author | markm <markm@FreeBSD.org> | 1998-03-21 08:18:57 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1998-03-21 08:18:57 +0000 |
| commit | 5caae7cbe026ce1e7edd615a25a1f38303d090a9 (patch) | |
| tree | 77f479a66e3b41f23bf0c458db8a410889e98202 | |
| parent | e8c92c6fcfaaf595be2152d08879e3c3cf4e58c9 (diff) | |
| download | FreeBSD-src-5caae7cbe026ce1e7edd615a25a1f38303d090a9.zip FreeBSD-src-5caae7cbe026ce1e7edd615a25a1f38303d090a9.tar.gz | |
Build both libscrypt and libdescrypt. There is no point in letting
libscrypt stagnate, even if it is superceded by libdescrypt. It is
a tiny library anyway, and building it is inexpensive.
| -rw-r--r-- | lib/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/Makefile b/lib/Makefile index 2655613..175b7c4 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -29,14 +29,11 @@ _csu=csu/${MACHINE_ARCH} _libc_r= libc_r .endif -.if !exists(${.CURDIR}/../secure) || defined(NOSECURE) || defined(NOCRYPT) +# Build both libraries. They have different names, so no harm, +# and this avoids having stale libscrypt.* _libcrypt= libcrypt -.else -_libcrypt= ../secure/lib/libcrypt -# Releases need both libraries. -.if defined(RELEASEDIR) -_libcrypt+= libcrypt -.endif +.if exists(${.CURDIR}/../secure) && !defined(NOSECURE) && !defined(NOCRYPT) +_libcrypt+= ../secure/lib/libcrypt .endif .if ${MACHINE_ARCH} == "i386" |
