svn commit: r204300 - head/share/zoneinfo

[Edwin Groothuis]

Author: edwin
Date: Thu Feb 25 06:44:16 2010
New Revision: 204300
URL: http://svn.freebsd.org/changeset/base/204300

Log:
  Officially speaking, the zoneinfo data files are contributed data.
  Therefore treat them as such.

Deleted:
  head/share/zoneinfo/africa
  head/share/zoneinfo/antarctica
  head/share/zoneinfo/asia
  head/share/zoneinfo/australasia
  head/share/zoneinfo/backward
  head/share/zoneinfo/etcetera
  head/share/zoneinfo/europe
  head/share/zoneinfo/factory
  head/share/zoneinfo/leapseconds
  head/share/zoneinfo/northamerica
  head/share/zoneinfo/pacificnew
  head/share/zoneinfo/southamerica
  head/share/zoneinfo/systemv
  head/share/zoneinfo/yearistype.sh
  head/share/zoneinfo/zone.tab
Modified:
  head/share/zoneinfo/Makefile

Modified: head/share/zoneinfo/Makefile
==============================================================================
--- head/share/zoneinfo/Makefile	Thu Feb 25 06:35:21 2010	(r204299)
+++ head/share/zoneinfo/Makefile	Thu Feb 25 06:44:16 2010	(r204300)
@@ -29,6 +29,8 @@
 #
 
 CLEANFILES+=	yearistype
+CONTRIBDIR=	${.CURDIR}/../../contrib/tzdata/
+.PATH:		${CONTRIBDIR}
 
 .if defined(LEAPSECONDS)
 LEAPFILE=	-L leapseconds
@@ -44,6 +46,8 @@ POSIXRULES=	America/New_York
 TZFILES+=	backward systemv
 .endif
 
+TZFILES:=	${TZFILES:S/^/${CONTRIBDIR}/}
+
 all: yearistype
 
 beforeinstall:
@@ -52,7 +56,7 @@ beforeinstall:
 	    -u ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 	    ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-	    ${.CURDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
+	    ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
 
 afterinstall:
 #