diff options
| author | ru <ru@FreeBSD.org> | 2002-06-21 08:54:03 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-06-21 08:54:03 +0000 |
| commit | 25fe20626e02a5453fe5e50217229a3f9d2925b4 (patch) | |
| tree | ca0aaebd5de820a84d2a30fd9f4306f7227b8706 | |
| parent | 37c7624aa90797b441184b242ab75bb86b617d00 (diff) | |
| download | FreeBSD-src-25fe20626e02a5453fe5e50217229a3f9d2925b4.zip FreeBSD-src-25fe20626e02a5453fe5e50217229a3f9d2925b4.tar.gz | |
Make NO_OPENSSL actually imply NO_OPENSSH, as documented in make.conf(5).
| -rw-r--r-- | Makefile.inc1 | 4 | ||||
| -rw-r--r-- | etc/Makefile | 9 | ||||
| -rw-r--r-- | secure/lib/Makefile | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index b5abb87..2ecd6bd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -717,11 +717,11 @@ _generic_libs+= lib .if !defined(NOCRYPT) && !defined(NOSECURE) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl -.endif -.if !defined(NO_OPENSSH) && !defined(NO_OPENSSL) +.if !defined(NO_OPENSSH) _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L .endif +.endif _generic_libs+= secure/lib .endif 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 diff --git a/secure/lib/Makefile b/secure/lib/Makefile index a6f15de..40731dd 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -6,9 +6,9 @@ SUBDIR+=libtelnet .endif .if !defined(NO_OPENSSL) SUBDIR+=libcrypto libssl -.endif .if !defined(NO_OPENSSH) SUBDIR+=libssh .endif +.endif .include <bsd.subdir.mk> |
