From 0e61e4dd084bf65e43aa4961b29b7e7d874b9fff Mon Sep 17 00:00:00 2001 From: Tim Vanderhoek Date: Sun, 4 Jun 2000 01:20:58 +0000 Subject: [PATCH] Install mailer.conf as ${BINOWN}, ${BINGRP}, rather than root:wheel. This lets unprivileged installworld: almost work first try and always work second. BINOWN isn't quite right for this, but it's not really worth creating a MAILOWN for this. --- usr.sbin/mailwrapper/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile index 0e6c8cf44424..02a189936b2a 100644 --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -11,9 +11,9 @@ SYMLINKS= ${BINDIR}/mailwrapper /usr/sbin/sendmail \ ${BINDIR}/mailwrapper /usr/bin/mailq afterinstall: - @if [ ! -f ${DESTDIR}/etc/mail/mailer.conf ]; then \ - ${INSTALL} -c -o root -g wheel -m 644 \ - ${.CURDIR}/../../etc/mail/mailer.conf ${DESTDIR}/etc/mail; \ - fi +.if !exists(${DESTDIR}/etc/mail/mailer.conf) + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${.CURDIR}/../../etc/mail/mailer.conf ${DESTDIR}/etc/mail +.endif .include