misc/94309: src/etc/Makefile fails with NO_CRYPT=yes

[Matthias Lederhofer]

>Number:         94309
>Category:       misc
>Synopsis:       src/etc/Makefile fails with NO_CRYPT=yes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 11 02:10:40 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Lederhofer
>Release:        6.0
>Organization:
>Environment:
FreeBSD 6.0-RELEASE-p5 FreeBSD 6.0-RELEASE-p5 #0: Tue Mar  7 20:52:38 CET 2006 i386
>Description:
Running make distribution in /usr/src/etc/ with NO_CRYPT=yes but NO_OPENSSL/NO_OPENSSH fails. The variable SSH is only set in line 29 if NO_CRYPT is undefined. But ${SSH} is used as parameter to install in line 117.
>How-To-Repeat:
cd /usr/src/etc; make distribution NO_CRYPT=yes

with NO_OPENSSL/NO_OPENSSH undefined
>Fix:
--- /usr/src/etc/Makefile.orig      Fri Mar 10 21:57:47 2006
+++ /usr/src/etc/Makefile       Fri Mar 10 22:12:16 2006
@@ -111,7 +111,7 @@
 .if !defined(NO_SENDMAIL)
        cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
-.if !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 .if !defined(NO_OPENSSH)
        cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
            ${SSH} ${DESTDIR}/etc/ssh

>Release-Note:
>Audit-Trail:
>Unformatted: