Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/etc/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/etc/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- src/etc/Makefile	1999/07/22 20:10:16	1.123
+++ src/etc/Makefile	1999/08/21 06:27:29	1.124
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.123 1999/07/22 20:10:16 is Exp $
+#	$NetBSD: Makefile,v 1.124 1999/08/21 06:27:29 simonb Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -38,7 +38,7 @@
 #	stuff for this target is found in etc.${MACHINE}/Makefile.inc.
 #    release: a synonym for `snapshot'
 
-# XXX: For NO_SENDMAIL and USE_BIND4
+# XXX: For NO_SENDMAIL, USE_BIND4 and INSTPRIV
 .include <bsd.own.mk>
 
 TZDIR=		/usr/share/zoneinfo
@@ -120,97 +120,102 @@ distribution: distrib-dirs
 	(cd ..; ${MAKE} _DISTRIB= includes)
 	(cd ..; ${MAKE} _DISTRIB= install)
 .endif
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 ${BIN2} ${DESTDIR}/etc
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 ${BIN3} ${DESTDIR}/etc
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 aliases ${DESTDIR}/etc
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} \
+	    ${DESTDIR}/etc
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 664 ${BIN2} \
+	    ${DESTDIR}/etc
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 600 ${BIN3} \
+	    ${DESTDIR}/etc
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 644 aliases \
+	    ${DESTDIR}/etc
 	/usr/libexec/sendmail/sendmail -O AliasFile=${DESTDIR}/etc/aliases -bi
-	${INSTALL} -c -o root -g wheel -m 600 crontab \
+	${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 600 crontab \
 	    ${DESTDIR}/var/cron/tabs/root
-	${INSTALL} -c -o root -g wheel -m 600 master.passwd ${DESTDIR}/etc
+	${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 600 master.passwd \
+	    ${DESTDIR}/etc
 	pwd_mkdb -p -d ${DESTDIR}/ ${DESTDIR}/etc/master.passwd
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	     MAKEDEV.local etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev
-	${INSTALL} -c -o root -g wheel -m 600 minfree \
+	${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 600 minfree \
 	    ${DESTDIR}/var/crash
 	(cd root; \
-		${INSTALL} -c -o root -g wheel -m 644 dot.cshrc \
+		${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 644 dot.cshrc \
 		    ${DESTDIR}/root/.cshrc; \
-		${INSTALL} -c -o root -g wheel -m 600 dot.klogin \
+		${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 600 dot.klogin \
 		    ${DESTDIR}/root/.klogin; \
-		${INSTALL} -c -o root -g wheel -m 644 dot.login \
+		${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 644 dot.login \
 		    ${DESTDIR}/root/.login; \
-		${INSTALL} -c -o root -g wheel -m 644 dot.profile \
+		${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 644 dot.profile \
 		    ${DESTDIR}/root/.profile; \
 		rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \
 		ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \
 		ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile)
 	(cd mtree; ${MAKE} install)
 	(cd namedb; \
-		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${NAMEDB} \
-		    ${DESTDIR}/etc/namedb)
+		${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
+		    ${NAMEDB} ${DESTDIR}/etc/namedb)
 	/bin/rm -f ${DESTDIR}/etc/localtime
 	ln -s ${TZDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime
 	/bin/rm -f ${DESTDIR}/etc/rmt
 	ln -s /usr/sbin/rmt ${DESTDIR}/etc/rmt
-	${INSTALL} -c -o ${BINOWN} -g operator -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g operator -m 664 /dev/null \
 		${DESTDIR}/etc/dumpdates
-	${INSTALL} -c -o ${BINOWN} -g operator -m 600 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g operator -m 600 /dev/null \
 		${DESTDIR}/etc/skeykeys
-	${INSTALL} -c -o root -g wheel -m 600 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 600 /dev/null \
 		${DESTDIR}/var/cron/log
-	${INSTALL} -c -o nobody -g ${BINGRP} -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o nobody -g ${BINGRP} -m 664 /dev/null \
 		${DESTDIR}/var/db/locate.database
-	${INSTALL} -c -o uucp -g dialer -m 640 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o uucp -g dialer -m 640 /dev/null \
 		${DESTDIR}/var/log/aculog
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
 		${DESTDIR}/var/log/authlog
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 		${DESTDIR}/var/log/lastlog
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \
 		${DESTDIR}/var/log/lpd-errs
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
 		${DESTDIR}/var/log/maillog
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 		${DESTDIR}/var/log/messages
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
 		${DESTDIR}/var/log/secure
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 		${DESTDIR}/var/log/wtmp
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
 		${DESTDIR}/var/log/xferlog
-	${INSTALL} -c -o daemon -g staff -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o daemon -g staff -m 664 /dev/null \
 		${DESTDIR}/var/msgs/bounds
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 		${DESTDIR}/var/run/utmp
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/atc_scores
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/battlestar.log
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/cfscores
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/criblog
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/robots_roll
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/rogue.scores
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/saillog
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/snakerawscores
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/snake.log
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/tetris.scores
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/larn/llog12.0
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/larn/lscore12.0
-	${INSTALL} -c -o games -g games -m 664 /dev/null \
+	${INSTALL} ${INSTPRIV} -c -o games -g games -m 664 /dev/null \
 		${DESTDIR}/var/games/larn/playerids
-	(cd etc.${MACHINE}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    fstab.* ${DESTDIR}/etc)
+	(cd etc.${MACHINE}; ${INSTALL} ${INSTPRIV} -c -o ${BINOWN} \
+	    -g ${BINGRP} -m 444 fstab.* ${DESTDIR}/etc)
 	(cd ${DESTDIR}/dev; ./MAKEDEV all)
 	(cd ../usr.bin/mail; ${MAKE} distribution)
 .ifndef NO_SENDMAIL
@@ -222,7 +227,7 @@ distribution: distrib-dirs
 
 
 distrib-dirs:
-	${INSTALL} -d -o root -g wheel -m 755 ${DESTDIR}
+	${INSTALL} ${INSTPRIV} -d -o root -g wheel -m 755 ${DESTDIR}
 	-mtree -def mtree/NetBSD.dist -p ${DESTDIR}/ -u
 	cd ${DESTDIR}; rm -f sys; ln -s usr/src/sys sys
 
@@ -246,9 +251,9 @@ release snapshot: distribution snap_pre 
 
 snap_pre:
 	/bin/rm -rf ${RELEASEDIR}
-	${INSTALL} -d -o root -g wheel -m 755 ${RELEASEDIR}
+	${INSTALL} ${INSTPRIV} -d -o root -g wheel -m 755 ${RELEASEDIR}
 .for dir in ${INSTALLATION_DIRS}
-	${INSTALL} -d -o root -g wheel -m 755 ${RELEASEDIR}/${dir}
+	${INSTALL} ${INSTPRIV} -d -o root -g wheel -m 755 ${RELEASEDIR}/${dir}
 .endfor
 
 # the regular expression does a basename(1) on .CURDIR so that we don't