From afceae0c473aeb1aba4390ed26dbdcaf513b70e8 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Sun, 22 Oct 1995 20:14:13 +0000 Subject: [PATCH] Wrong library was picked by ed --- bin/Makefile.inc | 6 +++--- bin/ed/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/Makefile.inc b/bin/Makefile.inc index 00b7d83cb6cd..5e19e782632a 100644 --- a/bin/Makefile.inc +++ b/bin/Makefile.inc @@ -5,10 +5,10 @@ NOSHARED?= YES .if exists (${.CURDIR}/../../secure) -.if exists(${.CURDIR}/../../secure/lib/libcrypt/obj) -CRYPTOBJDIR= ${.CURDIR}/../../secure/lib/libcrypt/obj +.if exists(${.CURDIR}/../../secure/lib/libcipher/obj) +CIPHEROBJDIR= ${.CURDIR}/../../secure/lib/libcipher/obj .else -CRYPTOBJDIR= ${.CURDIR}/../../secure/lib/libcrypt +CIPHEROBJDIR= ${.CURDIR}/../../secure/lib/libcipher .endif .endif diff --git a/bin/ed/Makefile b/bin/ed/Makefile index 50db9ef319f9..30816a88e77d 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.11 1995/10/01 14:17:29 markm Exp $ +# $Id: Makefile,v 1.12 1995/10/03 15:44:50 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c @@ -8,8 +8,8 @@ MLINKS= ed.1 red.1 .if exists(../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) DISTRIBUTION=des CFLAGS+=-DDES -LDADD+= -L${CRYPTOBJDIR} -ldescrypt -DPADD+= ${CRYPTOBJDIR}/libdescrypt.a +LDADD+= -L${CIPHEROBJDIR} -lcipher +DPADD+= ${CIPHEROBJDIR}/libcipher.a .endif .include