diff options
| author | simonb <simonb@NetBSD.org> | 1999-08-21 06:27:29 +0000 |
|---|---|---|
| committer | simonb <simonb@NetBSD.org> | 1999-08-21 06:27:29 +0000 |
| commit | b729f2c755cf04c4c8d57f583d2eebe195cf7ebf (patch) | |
| tree | 8095f3482198379301b007e6c6031c8a8e7130be | |
| parent | c31f7f041644733fbdab29efea8bc285f913bf36 (diff) | |
Use ${INSTPRIV} with ${INSTALL}.
| -rw-r--r-- | etc/Makefile | 103 | ||||
| -rw-r--r-- | games/hack/Makefile | 6 | ||||
| -rw-r--r-- | share/me/Makefile | 9 | ||||
| -rw-r--r-- | usr.sbin/sendmail/src/Makefile | 4 |
4 files changed, 64 insertions, 58 deletions
diff --git a/etc/Makefile b/etc/Makefile index a482add249b..be89a7b9dc4 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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_md_pre snap_kern snap_md_post 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 diff --git a/games/hack/Makefile b/games/hack/Makefile index b29faea0ed1..8598f9ea574 100644 --- a/games/hack/Makefile +++ b/games/hack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 1998/12/06 09:06:45 dbj Exp $ +# $NetBSD: Makefile,v 1.30 1999/08/21 06:27:29 simonb Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 .include <bsd.own.mk> @@ -51,9 +51,9 @@ afterinstall: clobber .endif clobber: - ${INSTALL} -c -o games -g games -m 660 /dev/null \ + ${INSTALL} ${INSTPRIV} -c -o games -g games -m 660 /dev/null \ ${DESTDIR}/var/games/hackdir/perm - ${INSTALL} -c -o games -g games -m 660 /dev/null \ + ${INSTALL} ${INSTPRIV} -c -o games -g games -m 660 /dev/null \ ${DESTDIR}/var/games/hackdir/record rm -f ${DESTDIR}/var/games/hackdir/bones* diff --git a/share/me/Makefile b/share/me/Makefile index 6f33e50cd8b..ab0815d1975 100644 --- a/share/me/Makefile +++ b/share/me/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/27/94 -# $NetBSD: Makefile,v 1.15 1999/08/06 07:32:07 pk Exp $ +# $NetBSD: Makefile,v 1.16 1999/08/21 06:27:29 simonb Exp $ MELIB= ${BINDIR}/me TMLIB= ${BINDIR}/tmac @@ -24,7 +24,7 @@ ${DESTDIR}${MELIB}/${M}: .MADE ${DESTDIR}${MELIB}/${M}: ${M} @rm -f ${.TARGET} /tmp/${M}.tmp sed -f ${.CURDIR}/strip.sed < ${.ALLSRC} > /tmp/${M}.tmp - ${INSTALL} ${RENAME} ${PRESERVE} -o ${BINOWN} \ + ${INSTALL} ${RENAME} ${PRESERVE} ${INSTPRIV} -o ${BINOWN} \ -g ${BINGRP} -m ${NONBINMODE} /tmp/${M}.tmp ${.TARGET} .endfor @@ -41,7 +41,7 @@ ${DESTDIR}${TMLIB}/${M}: .MADE ${DESTDIR}${TMLIB}/${M}: ${M} @rm -f ${.TARGET} /tmp/${M}.tmp sed -f ${.CURDIR}/strip.sed < ${.ALLSRC} > /tmp/${M}.tmp - ${INSTALL} ${RENAME} ${PRESERVE} -o ${BINOWN} \ + ${INSTALL} ${RENAME} ${PRESERVE} ${INSTPRIV} -o ${BINOWN} \ -g ${BINGRP} -m ${NONBINMODE} /tmp/${M}.tmp ${.TARGET} .endfor @@ -54,5 +54,6 @@ ${DESTDIR}${MELIB}/revisions: .MADE .endif ${DESTDIR}${MELIB}/revisions: revisions - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.ALLSRC} ${.TARGET} + ${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.ALLSRC} ${.TARGET} diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile index 3e623caddab..3a35139c115 100644 --- a/usr.sbin/sendmail/src/Makefile +++ b/usr.sbin/sendmail/src/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 1999/02/13 02:55:00 lukem Exp $ +# $NetBSD: Makefile,v 1.38 1999/08/21 06:27:29 simonb Exp $ # # NetBSD Makefile # @@ -49,7 +49,7 @@ FILESDIR=/usr/share/misc .endif afterinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/sendmail.st .include <bsd.prog.mk> |
