From 8d45ed67041cbf7f177dfd923fe56889b5a774d2 Mon Sep 17 00:00:00 2001
From: naddy <>
Date: Sun, 25 Jun 2000 16:04:03 +0000
Subject: [PATCH] increase flexibility of distribution-etc-root-var: -
 NOMAKEDEV to optionally skip making devices - allow building aliases.db under
 /var/tmp will come in handy with mergemaster; ok millert@

---
 src/etc/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 8691962b..8032bec8 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.112 2000/06/19 17:38:44 todd Exp $
+#	$OpenBSD: Makefile,v 1.113 2000/06/25 16:04:03 naddy Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -205,7 +205,9 @@ distribution-etc-root-var: distrib-dirs
 	(cd etc.${MACHINE}; ${INSTALL} -c -o ${BINOWN} -g wheel -m 444 \
 	    ld.so.conf ${DESTDIR}/etc)
 .endif
+.ifndef NOMAKEDEV
 	(cd ${DESTDIR}/dev; ./MAKEDEV all)
+.endif
 .if ${MACHINE} == "vax"
 	(cd etc.vax; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${PCS} \
 	    ${DESTDIR}/)
@@ -220,7 +222,8 @@ distribution-etc-root-var: distrib-dirs
 	${INSTALL} -c -o root -g ${BINGRP} -m 644 aliases \
 	    ${DESTDIR}/etc/mail/aliases
 	/usr/libexec/sendmail/sendmail -C${DESTDIR}/etc/mail/sendmail.cf \
-	    -bi -O AliasFile=${DESTDIR}/etc/mail/aliases
+	    -bi -O AliasFile=${DESTDIR}/etc/mail/aliases \
+	    -O DontBlameSendmail=mapinunsafedirpath
 	${INSTALL} -c -o root -g wheel -m 600 root/root.mail \
 		${DESTDIR}/var/mail/root