summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2003-06-08 08:24:07 +0000
committermarkm <markm@FreeBSD.org>2003-06-08 08:24:07 +0000
commitc9989cede15f06d79479c0bf66b6e6036958451d (patch)
tree26ac47ad2148ce1f0500c2b335d6015d60a03b0d
parent01de4910e4647197895071c271c016e34c0e240c (diff)
downloadFreeBSD-src-c9989cede15f06d79479c0bf66b6e6036958451d.zip
FreeBSD-src-c9989cede15f06d79479c0bf66b6e6036958451d.tar.gz
Fix for the NO_OPENSSL case.
Reported by: Marius Strobl <marius@alchemy.franken.de>
-rw-r--r--bin/ed/Makefile2
-rw-r--r--secure/usr.bin/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index e721cfa..5409cc0 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -5,7 +5,7 @@ SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)
+.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL)
DISTRIBUTION=crypto
CFLAGS+=-DDES
DPADD= ${LIBCRYPTO}
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index 791c8c5..77674ab 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
-SUBDIR= bdes
+SUBDIR=
.if !defined(NO_OPENSSL)
-SUBDIR+=openssl
+SUBDIR+=bdes openssl
.if !defined(NO_OPENSSH)
SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
.endif
OpenPOWER on IntegriCloud