diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2017-10-06 19:58:38 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2017-10-06 19:58:38 +0000 |
| commit | b0b3e01aafbe2b1baf161ac889c0779aec57b23d (patch) | |
| tree | c2b537ed3b128d11e9759d74f2d993d58c8f14b5 | |
| parent | bdbfe8542d3779c2932ee03047c84a050edc7a97 (diff) | |
Use the modern POSIX idiom "-exec ... {} +" instead of find|xargs and
combine the two find(1) invocations into one.
From Klemens Nanni; ok tb@
| -rw-r--r-- | include/Makefile | 9 | ||||
| -rw-r--r-- | share/zoneinfo/Makefile | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/Makefile b/include/Makefile index 1d7f894b595..24ada3330ea 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.219 2017/04/17 15:53:21 kettenis Exp $ +# $OpenBSD: Makefile,v 1.220 2017/10/06 19:58:37 naddy Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -100,10 +100,9 @@ includes: cd ${.CURDIR}/$$i && ${RUN_MAKE}; \ done chown -RP ${BINOWN}:${BINGRP} ${DESTDIR}/usr/include - find ${DESTDIR}/usr/include -type f -print0 | \ - xargs -0r chmod a=r - find ${DESTDIR}/usr/include \( -type d -o -type l \) -print0 | \ - xargs -0r chmod -h u=rwx,go=rx + find ${DESTDIR}/usr/include \ + -type f -exec chmod a=r {} + -o \ + \( -type d -o -type l \) -exec chmod -h u=rwx,go=rx {} + copies: @echo copies: ${LDIRS} diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 37789f0b6df..43b5d34bc3d 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2016/11/24 14:38:30 millert Exp $ +# $OpenBSD: Makefile,v 1.12 2017/10/06 19:58:37 naddy Exp $ # $NetBSD: Makefile,v 1.14 1995/04/22 12:10:17 cgd Exp $ # Change the line below for your time zone (after finding the zone you want in @@ -81,8 +81,9 @@ realinstall: ${DATA} ${REDO} ${YEARISTYPECOPY} (cd ${.CURDIR}/datfiles; \ ${ZIC} -y ${YEARISTYPECOPY} -d ${TZDIR} -p ${POSIXRULES}) chown -R ${BINOWN}:${BINGRP} ${TZDIR} - find ${TZDIR} -type f -print0 | xargs -0r chmod a=r - find ${TZDIR} -type d -print0 | xargs -0r chmod a=rx + find ${TZDIR} \ + -type f -exec chmod a=r {} + -o \ + -type d -exec chmod a=rx {} + ${INSTALL} -c -o root -g bin -m 644 ${.CURDIR}/datfiles/iso3166.tab \ ${DESTDIR}/usr/share/misc ${INSTALL} -c -o root -g bin -m 644 ${.CURDIR}/datfiles/zone.tab \ |