summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2003-11-02 22:13:36 +0000
committermarkm <markm@FreeBSD.org>2003-11-02 22:13:36 +0000
commit624344bf53e3481625602856c5d8f343875bb7e8 (patch)
tree4e93104fc22ae95c73e76cfd358c3e63fc1b4550 /etc
parent3cc8e8cc8d7917f4eaccd704278fa12a41ad4f84 (diff)
downloadFreeBSD-src-624344bf53e3481625602856c5d8f343875bb7e8.zip
FreeBSD-src-624344bf53e3481625602856c5d8f343875bb7e8.tar.gz
Use a better way to take NO_LPR into account, and correctly check the
NOCRYPT macro when looking at crypto. Reminded by: ru
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile
index fdf85b4..4177857 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
OpenPOWER on IntegriCloud