diff options
| author | markm <markm@FreeBSD.org> | 1999-01-23 08:27:46 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1999-01-23 08:27:46 +0000 |
| commit | a0f20ba4fc91853c1b11d690f3fc4eccf3a9a8a3 (patch) | |
| tree | 54e18fd1a40f0d109fa3c2656ca6cb3da498dbe1 /lib/libcrypt/Makefile | |
| parent | 41b93516e8ae0af9615f64c660b6568e39d00860 (diff) | |
| download | FreeBSD-src-a0f20ba4fc91853c1b11d690f3fc4eccf3a9a8a3.zip FreeBSD-src-a0f20ba4fc91853c1b11d690f3fc4eccf3a9a8a3.tar.gz | |
The new crypt code broke "make world". Back it out.
Diffstat (limited to 'lib/libcrypt/Makefile')
| -rw-r--r-- | lib/libcrypt/Makefile | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 74babe8..20d181b 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -1,57 +1,57 @@ # -# $Id: Makefile,v 1.14 1998/09/02 15:09:15 bde Exp $ +# $Id$ # -SHLIB_MAJOR= 3 -.PATH: ${.CURDIR}/../../lib/libmd -SRCS= crypt.c crypt-md5.c md5c.c crypt-shs.c shs.c -MAN3= crypt.3 shs.3 descrypt.3 -CFLAGS+= -I${.CURDIR}/../libmd -DLIBC_SCCS -DESCRYPT= ${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c - -## build exportable crypt or des crypt? -.if exists(${DESCRYPT}) && !defined(NOCRYPT) && !defined(NOSECURE) -.PATH: ${.CURDIR}/../../secure/lib/libcrypt -CIPHERTYPE= des -SRCS+= crypt-des.c -CFLAGS+= -I${.CURDIR} -DDES_CRYPT -.else -CIPHERTYPE= exp -.endif - -LIB=${CIPHERTYPE}crypt -LCRYPTBASE= libcrypt -LSCRYPTBASE= lib${LIB} +LCRYPTBASE= libcrypt +LSCRYPTBASE= libscrypt .if ${OBJFORMAT} != elf LCRYPTSO= ${LCRYPTBASE}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} LSCRYPTSO= ${LSCRYPTBASE}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} .else -SONAME= ${LCRYPTBASE}.so.${SHLIB_MAJOR} LCRYPTSO= ${LCRYPTBASE}.so.${SHLIB_MAJOR} LSCRYPTSO= ${LSCRYPTBASE}.so.${SHLIB_MAJOR} .endif +# called libscrypt - for scramble crypt! +.PATH: ${.CURDIR}/../libmd +LIB= scrypt +SRCS= crypt.c md5c.c +CFLAGS+= -I${.CURDIR}/../libmd -DLIBC_SCCS + +.if ${OBJFORMAT} == elf +SONAME= ${LCRYPTBASE}.so.${SHLIB_MAJOR} +.endif + +# We only install the links if they do not already exist. +# This may have to be revised + afterinstall: .if !defined(NOPIC) @cd ${DESTDIR}${SHLIBDIR}; \ + if [ ! -e ${LCRYPTSO} ]; then \ rm -f ${LCRYPTSO}; \ ln -s ${LSCRYPTSO} ${LCRYPTSO}; \ - rm -f ${LCRYPTBASE}.so.2; \ - ln -s ${LSCRYPTSO} ${LCRYPTBASE}.so.2 + fi .endif .if !defined(NOPIC) && ${OBJFORMAT} == elf @cd ${DESTDIR}${SHLIBDIR}; \ + if [ ! -e ${LCRYPTBASE}.so ]; then \ rm -f ${LCRYPTBASE}.so; \ - ln -s ${LSCRYPTBASE}.so libcrypt.so + ln -s ${LSCRYPTBASE}.so libcrypt.so; \ + fi .endif @cd ${DESTDIR}${LIBDIR}; \ + if [ ! -e ${LCRYPTBASE}.a ]; then \ rm -f ${LCRYPTBASE}.a; \ - ln -s ${LSCRYPTBASE}.a libcrypt.a + ln -s ${LSCRYPTBASE}.a libcrypt.a; \ + fi .if !defined(NOPROFILE) @cd ${DESTDIR}${LIBDIR}; \ + if [ ! -e ${LCRYPTBASE}_p.a ]; then \ rm -f ${LCRYPTBASE}_p.a; \ - ln -s ${LSCRYPTBASE}_p.a libcrypt_p.a + ln -s ${LSCRYPTBASE}_p.a libcrypt_p.a; \ + fi .endif .include <bsd.lib.mk> |
