svn commit: r245309 - in head: . share/zoneinfo

[Brooks Davis]

Author: brooks
Date: Fri Jan 11 18:37:51 2013
New Revision: 245309
URL: http://svnweb.freebsd.org/changeset/base/245309

Log:
  Use find -exec to install zoneinfo instead of requiring xargs to be an
  install tool.
  
  Suggested by:	delphij

Modified:
  head/Makefile.inc1
  head/share/zoneinfo/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Jan 11 17:51:03 2013	(r245308)
+++ head/Makefile.inc1	Fri Jan 11 18:37:51 2013	(r245309)
@@ -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 \

Modified: head/share/zoneinfo/Makefile
==============================================================================
--- head/share/zoneinfo/Makefile	Fri Jan 11 17:51:03 2013	(r245308)
+++ head/share/zoneinfo/Makefile	Fri Jan 11 18:37:51 2013	(r245309)
@@ -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/