diff options
| author | peter <peter@FreeBSD.org> | 1998-05-27 18:42:36 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-05-27 18:42:36 +0000 |
| commit | ff9be3e0ff15055bf9ce01f092bca081073a42a0 (patch) | |
| tree | f430a2a714baaa2840f5b8d63719011c289c1a85 /lib | |
| parent | d1817d351ae37699891cbdbfbef1f7d89a9dd7c6 (diff) | |
| download | FreeBSD-src-ff9be3e0ff15055bf9ce01f092bca081073a42a0.zip FreeBSD-src-ff9be3e0ff15055bf9ce01f092bca081073a42a0.tar.gz | |
If building and installing libdescrypt, do it first so that the symlinks
point to it rather than libscrypt.
This was how it was done prior to libscrypt being added in. This should
stop more people getting burnt with the /usr/lib -> /usr/lib/aout
transition, and the same when the ELF libs come online.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Makefile b/lib/Makefile index cce7453..1d56eab 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $Id: Makefile,v 1.67 1998/05/03 05:06:13 peter Exp $ +# $Id: Makefile,v 1.68 1998/05/13 22:54:03 jb Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -31,9 +31,10 @@ _libc_r= libc_r # Build both libraries. They have different names, so no harm, # and this avoids having stale libscrypt.* -_libcrypt= libcrypt .if exists(${.CURDIR}/../secure) && !defined(NOSECURE) && !defined(NOCRYPT) -_libcrypt+= ../secure/lib/libcrypt +_libcrypt= ../secure/lib/libcrypt libcrypt +.else +_libcrypt= libcrypt .endif .if ${MACHINE_ARCH} == "i386" |
