From d7a606482c1013423812bb32fecfc99518a5e7d8 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 2 Nov 2003 22:13:36 +0000
Subject: [PATCH] Use a better way to take NO_LPR into account, and correctly
 check the NOCRYPT macro when looking at crypto.

Reminded by:	ru
---
 etc/Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index fdf85b47a5d..4177857e9e6 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -19,8 +19,11 @@ BIN1=	amd.map apmd.conf auth.conf \
 	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
 	${.CURDIR}/../usr.bin/mail/misc/mail.rc \
 	${.CURDIR}/../usr.bin/locate/locate/locate.rc
+.if !defined(NO_LPR)
+BIN1+=	printcap
+.endif
 
-.if !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 .if !defined(NO_OPENSSH)
 SSH=	${.CURDIR}/../crypto/openssh/ssh_config \
 	${.CURDIR}/../crypto/openssh/sshd_config \
@@ -80,11 +83,6 @@ distribution:
 .if !defined(NO_I4B)
 	cd ${.CURDIR}/isdn; ${MAKE} install
 .endif
-.if !defined(NO_LPR)
-	cd ${.CURDIR}; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-		printcap ${DESTDIR}/etc
-.endif
 .if !defined(NO_SENDMAIL)
 	cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif