From 25fe20626e02a5453fe5e50217229a3f9d2925b4 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Fri, 21 Jun 2002 08:54:03 +0000
Subject: Make NO_OPENSSL actually imply NO_OPENSSH, as documented in
 make.conf(5).

---
 etc/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'etc/Makefile')

diff --git a/etc/Makefile b/etc/Makefile
index 5652c5b..65d7ec4 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -27,13 +27,12 @@ BIN1=   amd.map apmd.conf auth.conf \
 BIN1+=	rc.isdn
 .endif
 
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSH)
+.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSH)
 SSH=	${.CURDIR}/../crypto/openssh/ssh_config \
 	${.CURDIR}/../crypto/openssh/sshd_config \
 	moduli
 .endif
-
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
 SSL=	${.CURDIR}/../crypto/openssl/apps/openssl.cnf
 .endif
 
@@ -92,11 +91,11 @@ distribution:
 .if !defined(NO_SENDMAIL)
 	( cd ${.CURDIR}/sendmail; ${MAKE} distribution );
 .endif
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSH)
+.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSH)
 	(cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSH} \
 	    ${DESTDIR}/etc/ssh )
 .endif
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
 	(cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSL} \
 	    ${DESTDIR}/etc/ssl )
 .endif
-- 
cgit v1.1