Use find -exec to install zoneinfo instead of requiring xargs to be an

install tool.

Suggested by:	delphij
This commit is contained in:
Brooks Davis 2013-01-11 18:37:51 +00:00
parent 62557825cc
commit 22c2069fc3
2 changed files with 3 additions and 3 deletions

View File

@ -643,7 +643,7 @@ installcheck_UGID:
_install-info= install-info _install-info= install-info
.endif .endif
.if ${MK_ZONEINFO} != "no" .if ${MK_ZONEINFO} != "no"
_zoneinfo= zic tzsetup xargs _zoneinfo= zic tzsetup
.endif .endif
ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ ITOOLS= [ awk cap_mkdb cat chflags chmod chown \

View File

@ -79,9 +79,9 @@ zoneinfo: yearistype ${TDATA}
beforeinstall: beforeinstall:
cd ${TZBUILDDIR} && \ cd ${TZBUILDDIR} && \
find . -type f -print | xargs -I _FILE_ ${INSTALL} \ find . -type f -print -exec ${INSTALL} \
-o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
_FILE_ ${DESTDIR}/usr/share/zoneinfo/_FILE_ \{} ${DESTDIR}/usr/share/zoneinfo/\{} \;
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/