diff options
| author | dougb <dougb@FreeBSD.org> | 2000-10-29 06:57:59 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2000-10-29 06:57:59 +0000 |
| commit | b13f26d45b40a5f2d8c1d7ead5f3ffacf3dd63da (patch) | |
| tree | b9f14c7840c1853be5c5c3ffa004051741ce67dd /etc | |
| parent | 46bec1fd0f51f42f9fdb3d7bee144242c6a50aa5 (diff) | |
| download | FreeBSD-src-b13f26d45b40a5f2d8c1d7ead5f3ffacf3dd63da.zip FreeBSD-src-b13f26d45b40a5f2d8c1d7ead5f3ffacf3dd63da.tar.gz | |
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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/periodic/daily/Makefile | 6 | ||||
| -rw-r--r-- | etc/periodic/weekly/Makefile | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile index 8c18ea4..15201d4 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 ) diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile index 248122d..735fbde 100644 --- a/etc/periodic/daily/Makefile +++ b/etc/periodic/daily/Makefile @@ -13,14 +13,16 @@ BIN= 100.clean-disks \ 310.accounting \ 320.rdist \ 330.news \ - 340.uucp \ 400.status-disks \ - 410.status-uucp \ 420.status-network \ 430.status-rwho \ 440.status-mailq \ 450.status-security \ 460.status-mail-rejects \ 999.local +.if !defined(NOUUCP) +BIN+= 340.uucp \ + 410.status-uucp +.endif .include <bsd.prog.mk> diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile index b2db854..2433e69 100644 --- a/etc/periodic/weekly/Makefile +++ b/etc/periodic/weekly/Makefile @@ -1,12 +1,14 @@ # $FreeBSD$ BIN= 120.clean-kvmdb \ - 300.uucp \ 310.locate \ 320.whatis \ 330.catman \ 340.noid \ 400.status-pkg \ 999.local +.if !defined(NOUUCP) +BIN+= 300.uucp +.endif .include <bsd.prog.mk> |
