diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2001-12-06 10:50:23 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2001-12-06 10:50:23 +0000 |
| commit | aa70e98b87b4261182b8bbebddd40bced1b8af58 (patch) | |
| tree | 55c9ebf6c1e5548efc46c1e664163ec5678b78ef | |
| parent | 68f1d5a3544f940c8a2afc1312896dcf0329c96d (diff) | |
Notes
| -rw-r--r-- | bin/Makefile.inc | 10 | ||||
| -rw-r--r-- | 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 <bsd.prog.mk> |