diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/tzdata | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/tzdata')
| -rw-r--r-- | package/tzdata/Makefile | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile index 8fd111b3d..01d2858f3 100644 --- a/package/tzdata/Makefile +++ b/package/tzdata/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= tzdata PKG_VERSION:= 2013d PKG_RELEASE:= 3 PKG_MD5SUM:= 65b6818162230fc02f86f293376c73df 4616a9560270f180eeb9a08540636890 -PKG_DESCR:= Timezone data (/usr/share/zoneinfo) -PKG_SECTION:= utils +PKG_DESCR:= timezone data (/usr/share/zoneinfo) +PKG_SECTION:= base/apps PKG_URL:= http://www.iana.org/time-zones/ PKG_SITES:= http://www.iana.org/time-zones/repository/releases/ PKG_NOPARALLEL:= 1 @@ -18,16 +18,12 @@ DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz tzcode${PKG_VERSION}.ta WRKDIST= ${WRKDIR} # no use for tzselect, since that is a ksh-script -PKG_SUBPKGS:= TZDATA ZDUMP ZIC DATE -PKGSD_ZDUMP:= timezone file dumper -PKGSD_ZIC:= timezone file compiler +PKG_SUBPKGS:= TZDATA DATE PKGSD_DATE:= famous date utility include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,TZDATA,tzdata,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,ZDUMP,zdump,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZDUMP},${PKG_SECTION})) -$(eval $(call PKG_template,ZIC,zic,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZIC},${PKG_SECTION})) $(eval $(call PKG_template,DATE,date,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DATE},${PKG_SECTION})) CONFIG_STYLE:= manual @@ -57,14 +53,6 @@ tzdata-install: $(IDIR_TZDATA)/etc/localtime; \ fi -zdump-install: - ${INSTALL_DIR} ${IDIR_ZDUMP}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/etc/zdump ${IDIR_ZDUMP}/usr/sbin/ - -zic-install: - ${INSTALL_DIR} ${IDIR_ZIC}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/etc/zic ${IDIR_ZIC}/usr/sbin/ - date-install: ${INSTALL_DIR} ${IDIR_DATE}/usr/bin ${INSTALL_BIN} ${WRKINST}/bin/date ${IDIR_DATE}/usr/bin/ |