summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2001-12-06 10:50:23 +0000
committerru <ru@FreeBSD.org>2001-12-06 10:50:23 +0000
commitf0ecccca2c2001723a1880d79809197964e429b6 (patch)
tree55c9ebf6c1e5548efc46c1e664163ec5678b78ef /bin
parenta57107b602de1622f3e11d2b7156e33eff49b52c (diff)
downloadFreeBSD-src-f0ecccca2c2001723a1880d79809197964e429b6.zip
FreeBSD-src-f0ecccca2c2001723a1880d79809197964e429b6.tar.gz
-lcipher is an installable library.
Diffstat (limited to 'bin')
-rw-r--r--bin/Makefile.inc10
-rw-r--r--bin/ed/Makefile4
2 files changed, 2 insertions, 12 deletions
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 29cd22b..61c3471 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 95901a6..00f47da 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 <bsd.prog.mk>
OpenPOWER on IntegriCloud