summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2013-01-11 18:37:51 +0000
committerBrooks Davis <brooks@FreeBSD.org>2013-01-11 18:37:51 +0000
commit22c2069fc323fc132c15f8ddb307cabbd03cf5c6 (patch)
tree33c60a0f73fc6bfb87548dd954b51cffeb258991
parent62557825ccdf1bfe5f733fd836c3f757378f0f42 (diff)
downloadsrc-test2-22c2069fc323fc132c15f8ddb307cabbd03cf5c6.tar.gz
src-test2-22c2069fc323fc132c15f8ddb307cabbd03cf5c6.zip
Use find -exec to install zoneinfo instead of requiring xargs to be an
install tool. Suggested by: delphij
Notes
Notes: svn path=/head/; revision=245309
-rw-r--r--Makefile.inc12
-rw-r--r--share/zoneinfo/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 87b57a70c14d..e486331e1f72 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -643,7 +643,7 @@ installcheck_UGID:
_install-info= install-info
.endif
.if ${MK_ZONEINFO} != "no"
-_zoneinfo= zic tzsetup xargs
+_zoneinfo= zic tzsetup
.endif
ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 97181dacd877..bccea5ec5089 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -79,9 +79,9 @@ zoneinfo: yearistype ${TDATA}
beforeinstall:
cd ${TZBUILDDIR} && \
- find . -type f -print | xargs -I _FILE_ ${INSTALL} \
+ find . -type f -print -exec ${INSTALL} \
-o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
- _FILE_ ${DESTDIR}/usr/share/zoneinfo/_FILE_
+ \{} ${DESTDIR}/usr/share/zoneinfo/\{} \;
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/