diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-06-21 08:54:03 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-06-21 08:54:03 +0000 |
| commit | 072f6798f837d6b05f10ad69fd742bc352f5bcab (patch) | |
| tree | ca0aaebd5de820a84d2a30fd9f4306f7227b8706 /etc/Makefile | |
| parent | 382ac430cd76bf985f194e2c489e16a397101fa3 (diff) | |
| download | src-072f6798f837d6b05f10ad69fd742bc352f5bcab.tar.gz src-072f6798f837d6b05f10ad69fd742bc352f5bcab.zip | |
Make NO_OPENSSL actually imply NO_OPENSSH, as documented in make.conf(5).
Notes
Notes:
svn path=/head/; revision=98548
Diffstat (limited to 'etc/Makefile')
| -rw-r--r-- | etc/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/etc/Makefile b/etc/Makefile index 5652c5b6c890..65d7ec469e1d 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 |