diff options
| author | Martin Natano <natano@cvs.openbsd.org> | 2016-09-25 17:43:12 +0000 |
|---|---|---|
| committer | Martin Natano <natano@cvs.openbsd.org> | 2016-09-25 17:43:12 +0000 |
| commit | 1b801bf4dedad366ed5604677b3f1eeddb9e1d2b (patch) | |
| tree | e64d29d326ddb816473e32080f8aa1dfa205290f /share | |
| parent | 8095f05028b41ecaebae2c9eb23e18bc7e94ee70 (diff) | |
Some ownership fixes for /usr/share/.
feedback and tweaks rpe
ok tb
Diffstat (limited to 'share')
| -rw-r--r-- | share/misc/pcvtfonts/Makefile | 11 | ||||
| -rw-r--r-- | share/snmp/Makefile | 5 | ||||
| -rw-r--r-- | share/termtypes/Makefile | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/share/misc/pcvtfonts/Makefile b/share/misc/pcvtfonts/Makefile index be19d33fb63..12805f02e92 100644 --- a/share/misc/pcvtfonts/Makefile +++ b/share/misc/pcvtfonts/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2002/05/13 15:27:58 mickey Exp $ +# $OpenBSD: Makefile,v 1.7 2016/09/25 17:43:11 natano Exp $ FONTS = vt220l.814 vt220h.814 vt220l.808 vt220h.808 \ vt220l.816 vt220h.816 vt220l.810 vt220h.810 \ @@ -16,12 +16,9 @@ FONTDIR = ${BINDIR}/misc/pcvtfonts all: $(FONTS) install: ${FONTS} - @if [ ! -d ${DESTDIR}${FONTDIR} ]; then mkdir ${DESTDIR}${FONTDIR};fi - @for i in ${FONTS}; do \ - echo "installing font $$i into ${DESTDIR}${FONTDIR}"; \ - install -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \ - $$i ${DESTDIR}${FONTDIR}; \ - done + ${INSTALL} -d -o root -g wheel ${DESTDIR}${FONTDIR} + ${INSTALL} ${INSTALL_COPY} -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \ + ${FONTS} ${DESTDIR}${FONTDIR} clean: rm -f ${CLEANFILES} diff --git a/share/snmp/Makefile b/share/snmp/Makefile index c3ab37e8917..b20c125e82b 100644 --- a/share/snmp/Makefile +++ b/share/snmp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2016/01/29 03:06:00 jsg Exp $ +# $OpenBSD: Makefile,v 1.5 2016/09/25 17:43:11 natano Exp $ FILES= OPENBSD-SNMPD-CONF.txt OPENBSD-BASE-MIB.txt FILES+= OPENBSD-MEM-MIB.txt OPENBSD-SENSORS-MIB.txt @@ -8,6 +8,7 @@ FILES+= OPENBSD-RELAYD-MIB.txt all clean cleandir depend lint obj tags: _SUBDIRUSE realinstall: - ${INSTALL} -c -m 0444 ${FILES} ${DESTDIR}${BINDIR}/snmp/mibs + ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 0444 \ + ${FILES} ${DESTDIR}${BINDIR}/snmp/mibs .include <bsd.prog.mk> diff --git a/share/termtypes/Makefile b/share/termtypes/Makefile index a4df7e32450..a91a93327ed 100644 --- a/share/termtypes/Makefile +++ b/share/termtypes/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2015/12/03 11:30:46 nicm Exp $ +# $OpenBSD: Makefile,v 1.25 2016/09/25 17:43:11 natano Exp $ MAN= termcap.5 TIC= /usr/bin/tic @@ -14,12 +14,14 @@ termcap: termtypes.master @[ -s ${.TARGET} ] || exit 1 realinstall: + ${INSTALL} -d -o root -g wheel ${DESTDIR}${BINDIR}/terminfo find terminfo -type f -exec \ ${INSTALL} -D ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ {} ${DESTDIR}${BINDIR}/{} \; ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap \ ${DESTDIR}${BINDIR}/misc/termcap ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap + chown -h root:wheel ${DESTDIR}/etc/termcap clean: rm -f termcap |