summaryrefslogtreecommitdiffstats
path: root/bin/ed
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-06-06 04:09:07 +0000
committerimp <imp@FreeBSD.org>2014-06-06 04:09:07 +0000
commit0ed032933fe4bf3f047df5412d8df4df9da9c4d3 (patch)
tree59c8f747159b3db5af5ad9aa0b3246c6c9382ff5 /bin/ed
parent76945251893ff381099d670ad70698e1b0d67285 (diff)
downloadFreeBSD-src-0ed032933fe4bf3f047df5412d8df4df9da9c4d3.zip
FreeBSD-src-0ed032933fe4bf3f047df5412d8df4df9da9c4d3.tar.gz
When building picobsd, define WITHOUT_OPENSSL and WITHOUT_KERBEROS and
remove the now-redundant checks for RELEASE_CRUNCH. This originally was defined for building smaller sysinstall images, but was later also used by picobsd builds for a similar purpose. Now that we've moved away from sysinstall, picobsd is the only remaining consumer of this interface. Adding these two options reduces the RELEASE_CRUNCH special cases in the tree by half.
Diffstat (limited to 'bin/ed')
-rw-r--r--bin/ed/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index fb1c37d..cc47a42 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -7,9 +7,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 !defined(RELEASE_CRUNCH) && \
- ${MK_OPENSSL} != "no" && \
- ${MK_ED_CRYPTO} != "no"
+.if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no"
CFLAGS+=-DDES
DPADD= ${LIBCRYPTO}
LDADD= -lcrypto
OpenPOWER on IntegriCloud