aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/Makefile2
-rw-r--r--etc/Makefile4
-rw-r--r--etc/periodic/daily/Makefile6
-rw-r--r--etc/periodic/weekly/Makefile4
4 files changed, 11 insertions, 5 deletions
diff --git a/bin/Makefile b/bin/Makefile
index a5e0c6f1dba7..f7844a5987ae 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -34,7 +34,7 @@ SUBDIR= cat \
SUBDIR+=csh
.endif
-.if !defined(NO_SENDMAIL)
+.if !defined(NO_SENDMAIL) && !defined(NOUUCP)
SUBDIR+=rmail
.endif
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 )
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 248122d43b06..735fbdee6380 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 b2db854305b2..2433e69d9104 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>