diff options
| author | Xin LI <delphij@FreeBSD.org> | 2020-04-09 05:11:18 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2020-04-09 05:11:18 +0000 |
| commit | f5b7695d2d5abd735064870ad43f4b9c723940c1 (patch) | |
| tree | 3453e48f26bf47455c39ef8348f4dd90a6a5766d /share/zoneinfo | |
| parent | 6b5225e433161352ec9eb4d105b6e53781d04d96 (diff) | |
| download | src-test2-f5b7695d2d5abd735064870ad43f4b9c723940c1.tar.gz src-test2-f5b7695d2d5abd735064870ad43f4b9c723940c1.zip | |
Notes
Diffstat (limited to 'share/zoneinfo')
| -rw-r--r-- | share/zoneinfo/Makefile | 13 | ||||
| -rw-r--r-- | share/zoneinfo/tests/Makefile | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 1cf1b42dfcc3..08867dc673fd 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -40,11 +40,6 @@ CONTRIBDIR= ${SRCTOP}/contrib/tzdata/ MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes .endif -.if defined(OLDTIMEZONES) -.warning "Using backwards compatibility variable for OLDTIMEZONES; please use WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT instead" -MK_ZONEINFO_OLD_TIMEZONES_SUPPORT= yes -.endif - .if ${MK_ZONEINFO_LEAPSECONDS_SUPPORT} != "no" LEAPFILE= -L ${CONTRIBDIR}leapseconds .else @@ -53,11 +48,8 @@ LEAPFILE= TZFILES= africa antarctica asia australasia etcetera europe \ factory northamerica southamerica -POSIXRULES= America/New_York - -.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no" TZFILES+= backward systemv -.endif +POSIXRULES= America/New_York TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/} @@ -78,10 +70,7 @@ TZBUILDSUBDIRS= \ Indian \ Pacific \ SystemV - -.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no" TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil -.endif .if !defined(_SKIP_BUILD) all: zoneinfo diff --git a/share/zoneinfo/tests/Makefile b/share/zoneinfo/tests/Makefile index b8515df02291..924da5c3a44e 100644 --- a/share/zoneinfo/tests/Makefile +++ b/share/zoneinfo/tests/Makefile @@ -8,10 +8,8 @@ PACKAGE= tests FILESGROUPS+= TESTFILES -.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no" ATF_TESTS_SH+= backward_test TESTFILES+= backward -.endif TESTFILES+= zoneinfo_common.sh TESTFILESPACKAGE= ${PACKAGE} |