From aa70e98b87b4261182b8bbebddd40bced1b8af58 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 6 Dec 2001 10:50:23 +0000 Subject: [PATCH] -lcipher is an installable library. --- bin/Makefile.inc | 10 ---------- bin/ed/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/bin/Makefile.inc b/bin/Makefile.inc index 29cd22b54e8a..61c34713dda5 100644 --- a/bin/Makefile.inc +++ b/bin/Makefile.inc @@ -5,13 +5,3 @@ BINDIR?= /bin CFLAGS+= -Wall -Wformat NOSHARED?= YES WARNS?= 2 - -.if exists (${.CURDIR}/../../secure) - -.if exists(${.CURDIR}/../../secure/lib/libcipher/obj) -CIPHEROBJDIR= ${.CURDIR}/../../secure/lib/libcipher/obj -.else -CIPHEROBJDIR= ${.CURDIR}/../../secure/lib/libcipher -.endif - -.endif diff --git a/bin/ed/Makefile b/bin/ed/Makefile index 95901a69bd0e..00f47da8246b 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -8,8 +8,8 @@ MLINKS= ed.1 red.1 .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) DISTRIBUTION=crypto CFLAGS+=-DDES -LDADD+= -L${CIPHEROBJDIR} -lcipher -DPADD+= ${CIPHEROBJDIR}/libcipher.a +DPADD= ${LIBCIPHER} +LDADD= -lcipher .endif .include