From 68b138298028d440cff9ba37ebf6f89e5a0f3b4d Mon Sep 17 00:00:00 2001 From: jkh Date: Mon, 25 Jun 2001 00:43:10 +0000 Subject: Fix crypto targets to be user-overridable and also obey the NO_SENDMAIL flag if set. The whole NO_FOO mechanism in /usr/src is pretty bogus and needs to be re-examined in the context of a larger argument about modularity, but that's something for another time. Submitted by: Peter Pentchev --- release/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'release') diff --git a/release/Makefile b/release/Makefile index 318d4fd..e683e62 100644 --- a/release/Makefile +++ b/release/Makefile @@ -174,6 +174,14 @@ BIGBOOTLABEL= minimum2 ZIPNSPLIT= gzip --no-name -9 -c | split -b 240640 - +# Things that need to be compiled without crypto support in releases +.if !defined(FIXCRYPTO) +FIXCRYPTO= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump +.if !defined(NO_SENDMAIL) +FIXCRYPTO+= usr.sbin/sendmail +.endif +.endif + # Things which may get you into trouble if you change them MTREEFILES= ${.CURDIR}/../etc/mtree @@ -466,7 +474,7 @@ release.4: # release.5: # Handle some grief caused by the munition braindeadness. - for i in bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/sendmail usr.sbin/tcpdump/tcpdump ; do \ + for i in ${FIXCRYPTO}; do \ ( cd ${.CURDIR}/../$$i; \ make -DNOCRYPT clean all distribute DISTDIR=${RD}/trees ) ; \ done -- cgit v1.1