diff options
| author | Mark Murray <markm@FreeBSD.org> | 1998-03-21 08:18:57 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 1998-03-21 08:18:57 +0000 |
| commit | efa3929e79a2b28c120b091e6cd29c6b23dab9f7 (patch) | |
| tree | dc85e65c2a404c80a585f3b32b0b05ee75c46a7a /lib/Makefile | |
| parent | c0a3aab8111f8a9830bfa0bdebfad94d5472b9bc (diff) | |
| download | src-efa3929e79a2b28c120b091e6cd29c6b23dab9f7.tar.gz src-efa3929e79a2b28c120b091e6cd29c6b23dab9f7.zip | |
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.
Notes
Notes:
svn path=/head/; revision=34738
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/Makefile b/lib/Makefile index 265561394e84..175b7c4be967 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" |