From 9fc9ecb643acdc5dfbe1f20994318aeb352dd8cf Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Sun, 29 Oct 2000 06:57:59 +0000 Subject: Finish the job of conditionalizing UUCP by preventing files in /etc/uucp from being installed, and make rmail conditional on neither of NO_SENDMAIL and NOUUCP. PR: bin/21321 Submitted by: Me --- etc/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'etc/Makefile') diff --git a/etc/Makefile b/etc/Makefile index 8c18ea4b5811..15201d4a28c5 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -70,7 +70,6 @@ distribution: master.passwd ${DESTDIR}/etc; \ ( cd ${.CURDIR}/periodic; ${MAKE} install ); \ ( cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall ); \ - ( cd ${.CURDIR}/../gnu/libexec/uucp/sample; ${MAKE} install ); \ ( cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap ); \ ( cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt ); \ ( cd ${.CURDIR}/sendmail; ${MAKE} etc-sendmail.cf ); \ @@ -78,6 +77,9 @@ distribution: pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \ MAKEDEV.local MAKEDEV ${DESTDIR}/dev ) +.if !defined(NOUUCP) + ( cd ${.CURDIR}/../gnu/libexec/uucp/sample; ${MAKE} install ) +.endif .if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSH) (cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSH} \ ${DESTDIR}/etc/ssh ) -- cgit v1.2.3