2222# DATAFORM= main
2323# To wait even longer for new features, use:
2424# DATAFORM= rearguard
25+ # Rearguard users might also want "ZFLAGS = -b fat"; see below.
2526DATAFORM = main
2627
2728# Change the line below for your timezone (after finding the one you want in
2829# one of the $(TDATA) source files, or adding it to a source file).
2930# Alternatively, if you discover you've got the wrong timezone, you can just
30- # zic -l rightzone
31- # to correct things.
31+ # 'zic -l -' to remove it, or 'zic -l rightzone' to change it.
3232# Use the command
3333# make zonenames
3434# to get a list of the values you can use for LOCALTIME.
@@ -37,33 +37,30 @@ LOCALTIME= GMT
3737
3838# The POSIXRULES macro controls interpretation of nonstandard and obsolete
3939# POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules.
40- # In the reference implementation, if you want something other than Eastern
41- # United States time as a template for handling these settings, you can
42- # change the line below (after finding the timezone you want in the
43- # one of the $(TDATA) source files, or adding it to a source file).
44- # A setting like TZ='EET-2EEST' is supposed to use the rules in the
45- # template file to determine "spring forward" and "fall back" days and
46- # times; the environment variable itself specifies UT offsets of standard and
47- # daylight saving time.
48- # Alternatively, if you discover you've got the wrong timezone, you can just
49- # zic -p rightzone
50- # to correct things.
51- # Use the command
52- # make zonenames
53- # to get a list of the values you can use for POSIXRULES.
40+ # Such a setting uses the rules in a template file to determine
41+ # "spring forward" and "fall back" days and times; the environment
42+ # variable itself specifies UT offsets of standard and daylight saving time.
5443#
55- # If POSIXRULES is empty, no template is installed; this is the intended
56- # future default for POSIXRULES.
44+ # If POSIXRULES is '-', no template is installed; this is the default.
5745#
58- # Nonempty POSIXRULES is obsolete and should not be relied on, because :
46+ # Any other value for POSIXRULES is obsolete and should not be relied on, as :
5947# * It does not work correctly in popular implementations such as GNU/Linux.
6048# * It does not work in the tzdb implementation for timestamps after 2037.
6149# * It is incompatible with 'zic -b slim' if POSIXRULES specifies transitions
6250# at standard time or UT rather than at local time.
6351# In short, software should avoid ruleless settings like TZ='EET-2EEST'
6452# and so should not depend on the value of POSIXRULES.
53+ #
54+ # If, despite the above, you want a template for handling these settings,
55+ # you can change the line below (after finding the timezone you want in the
56+ # one of the $(TDATA) source files, or adding it to a source file).
57+ # Alternatively, if you discover you've got the wrong timezone, you can just
58+ # 'zic -p -' to remove it, or 'zic -p rightzone' to change it.
59+ # Use the command
60+ # make zonenames
61+ # to get a list of the values you can use for POSIXRULES.
6562
66- POSIXRULES = America/New_York
63+ POSIXRULES = -
6764
6865# Also see TZDEFRULESTRING below, which takes effect only
6966# if the time zone files cannot be accessed.
@@ -172,9 +169,6 @@ TZDATA_TEXT= leapseconds tzdata.zi
172169
173170# For backward-compatibility links for old zone names, use
174171# BACKWARD= backward
175- # If you also want the link US/Pacific-New, even though it is confusing
176- # and is planned to be removed from the database eventually, use
177- # BACKWARD= backward pacificnew
178172# To omit these links, use
179173# BACKWARD=
180174
@@ -192,10 +186,6 @@ PACKRATDATA=
192186
193187UTF8_LOCALE = en_US.utf8
194188
195- # Since "." may not be in PATH...
196-
197- YEARISTYPE = ./yearistype
198-
199189# Non-default libraries needed to link.
200190LDLIBS =
201191
@@ -253,13 +243,12 @@ LDLIBS=
253243# other than simply getting garbage data
254244# -DUSE_LTZ=0 to build zdump with the system time zone library
255245# Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
256- # -DZIC_BLOAT_DEFAULT=\"slim \" to default zic's -b option to "slim ", and
257- # similarly for "fat ". Fat TZif files work around incompatibilities
246+ # -DZIC_BLOAT_DEFAULT=\"fat \" to default zic's -b option to "fat ", and
247+ # similarly for "slim ". Fat TZif files work around incompatibilities
258248# and bugs in some TZif readers, notably readers that mishandle 64-bit
259249# data in TZif files. Slim TZif files are more efficient and do not
260250# work around these incompatibilities and bugs. If not given, the
261- # current default is "fat" but this is intended to change as readers
262- # requiring fat files often mishandle timestamps after 2037 anyway.
251+ # default is "slim".
263252# -DZIC_MAX_ABBR_LEN_WO_WARN=3
264253# (or some other number) to set the maximum time zone abbreviation length
265254# that zic will accept without a warning (the default is 6)
@@ -333,9 +322,8 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \
333322# add
334323# -DSTD_INSPIRED
335324# to the end of the "CFLAGS=" line. This arranges for the functions
336- # "tzsetwall", " offtime", "timelocal", "timegm", "timeoff",
325+ # "offtime", "timelocal", "timegm", "timeoff",
337326# "posix2time", and "time2posix" to be added to the time conversion library.
338- # "tzsetwall" is deprecated and is intended to be removed soon; see NEWS.
339327# "offtime" is like "gmtime" except that it accepts a second (long) argument
340328# that gives an offset to add to the time_t when converting it.
341329# "timelocal" is equivalent to "mktime".
@@ -395,7 +383,7 @@ ZIC= $(zic) $(ZFLAGS)
395383
396384# To shrink the size of installed TZif files,
397385# append "-r @N" to omit data before N-seconds-after-the-Epoch.
398- # You can also append "-b slim" if that is not already the default ;
386+ # To grow the files and work around older application bugs, append "-b fat" ;
399387# see ZIC_BLOAT_DEFAULT above.
400388# See the zic man page for more about -b and -r.
401389ZFLAGS =
@@ -424,26 +412,6 @@ CURL= curl
424412# Name of GNU Privacy Guard <https://gnupg.org/>, used to sign distributions.
425413GPG = gpg
426414
427- # The path where SGML DTDs are kept and the catalog file(s) to use when
428- # validating HTML 4.01. The default should work on both Debian and Red Hat.
429- SGML_TOPDIR = /usr
430- SGML_DTDDIR = $(SGML_TOPDIR ) /share/xml/w3c-sgml-lib/schema/dtd
431- SGML_SEARCH_PATH = $(SGML_DTDDIR ) /REC-html401-19991224
432- SGML_CATALOG_FILES = \
433- $(SGML_TOPDIR ) /share/doc/w3-recs/html/www.w3.org/TR/1999/REC-html401-19991224/HTML4.cat:$(SGML_TOPDIR ) /share/sgml/html/4.01/HTML4.cat
434-
435- # The name, arguments and environment of a program to validate HTML 4.01.
436- # See <http://openjade.sourceforge.net/doc/> for a validator, and
437- # <https://validator.w3.org/source/> for a validation library.
438- # Set VALIDATE=':' if you do not have such a program.
439- VALIDATE = nsgmls
440- VALIDATE_FLAGS = -s -B -wall -wno-unused-param
441- VALIDATE_ENV = \
442- SGML_CATALOG_FILES='$(SGML_CATALOG_FILES ) ' \
443- SGML_SEARCH_PATH='$(SGML_SEARCH_PATH ) ' \
444- SP_CHARSET_FIXED=YES \
445- SP_ENCODING=UTF-8
446-
447415# This expensive test requires USE_LTZ.
448416# To suppress it, define this macro to be empty.
449417CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
@@ -538,16 +506,16 @@ DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
538506PRIMARY_YDATA= africa antarctica asia australasia \
539507 europe northamerica southamerica
540508YDATA= $( PRIMARY_YDATA) etcetera
541- NDATA= systemv factory
542- TDATA_TO_CHECK= $( YDATA) $( NDATA) backward pacificnew
509+ NDATA= factory
510+ TDATA_TO_CHECK= $( YDATA) $( NDATA) backward
543511TDATA= $( YDATA) $( NDATA) $( BACKWARD)
544512ZONETABLES= zone1970.tab zone.tab
545513TABDATA= iso3166.tab $( TZDATA_TEXT) $( ZONETABLES)
546514LEAP_DEPS= leapseconds.awk leap-seconds.list
547515TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $( TDATA) $( PACKRATDATA)
548516DSTDATA_ZI_DEPS= ziguard.awk $( TDATA) $( PACKRATDATA)
549517DATA= $( TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \
550- leapseconds yearistype.sh $( ZONETABLES)
518+ leapseconds $( ZONETABLES)
551519AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk \
552520 ziguard.awk zishrink.awk
553521MISC= $( AWK_SCRIPTS) zoneinfo2tdf.pl
@@ -573,12 +541,10 @@ VERSION_DEPS= \
573541 etcetera europe factory iso3166.tab \
574542 leap-seconds.list leapseconds.awk localtime.c \
575543 newctime.3 newstrftime.3 newtzset.3 northamerica \
576- pacificnew private.h \
577- southamerica strftime.c systemv theory.html \
544+ private.h southamerica strftime.c theory.html \
578545 time2posix.3 tz-art.html tz-how-to.html tz-link.html \
579546 tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
580- workman.sh yearistype.sh \
581- zdump.8 zdump.c zic.8 zic.c \
547+ workman.sh zdump.8 zdump.c zic.8 zic.c \
582548 ziguard.awk zishrink.awk \
583549 zone.tab zone1970.tab zoneinfo2tdf.pl
584550
@@ -587,7 +553,7 @@ VERSION_DEPS= \
587553
588554SHELL= /bin/sh
589555
590- all: tzselect yearistype zic zdump libtz.a $( TABDATA) \
556+ all: tzselect zic zdump libtz.a $( TABDATA) \
591557 vanguard.zi main.zi rearguard.zi
592558
593559ALL: all date $( ENCHILADA)
@@ -657,10 +623,6 @@ zdump: $(TZDOBJS)
657623zic: $( TZCOBJS)
658624 $( CC) -o $@ $( CFLAGS) $( LDFLAGS) $( TZCOBJS) $( LDLIBS)
659625
660- yearistype: yearistype.sh
661- cp yearistype.sh yearistype
662- chmod +x yearistype
663-
664626leapseconds: $( LEAP_DEPS)
665627 $( AWK) -v EXPIRES_LINE=$( EXPIRES_LINE) \
666628 -f leapseconds.awk leap-seconds.list > $@ .out
@@ -675,10 +637,9 @@ INSTALLARGS = \
675637 PACKRATDATA=' $(PACKRATDATA)' \
676638 TZDEFAULT=' $(TZDEFAULT)' \
677639 TZDIR=' $(TZDIR)' \
678- YEARISTYPE=' $(YEARISTYPE)' \
679640 ZIC=' $(ZIC)'
680641
681- INSTALL_DATA_DEPS = zic leapseconds yearistype tzdata.zi
642+ INSTALL_DATA_DEPS = zic leapseconds tzdata.zi
682643
683644# 'make install_data' installs one set of TZif files.
684645install_data: $( INSTALL_DATA_DEPS)
@@ -793,7 +754,7 @@ check_character_set: $(ENCHILADA)
793754 ! grep -Env $( SAFE_LINE) ' |^UNUSUAL_OK_' $( OK_CHAR) ' *$$' \
794755 Makefile && \
795756 ! grep -Env $( SAFE_SHARP_LINE) $( TDATA_TO_CHECK) backzone \
796- leapseconds yearistype.sh zone.tab && \
757+ leapseconds zone.tab && \
797758 ! grep -Env $( OK_LINE) $( ENCHILADA) ; \
798759 }
799760 touch $@
@@ -845,15 +806,13 @@ check_tzs: $(TZS) $(TZS_NEW)
845806check_web: $( CHECK_WEB_PAGES)
846807check_theory.html: theory.html
847808check_tz-art.html: tz-art.html
809+ check_tz-how-to.html: tz-how-to.html
848810check_tz-link.html: tz-link.html
849- check_theory.html check_tz-art.html check_tz-link.html:
811+ check_theory.html check_tz-art.html check_tz-how-to.html check_tz- link.html:
850812 $( CURL) -s S --url https://validator.w3.org/nu/ -F out= gnu \
851813 -F file= @$$ (expr $@ : ' check_\(.*\)' ) -o $@ .out && \
852814 test ! -s $@ .out || { cat $@ .out; exit 1; }
853815 mv $@ .out $@
854- check_tz-how-to.html: tz-how-to.html
855- $( VALIDATE_ENV) $( VALIDATE) $( VALIDATE_FLAGS) tz-how-to.html
856- touch $@
857816
858817# Check that zishrink.awk does not alter the data, and that ziguard.awk
859818# preserves main-format data.
@@ -883,7 +842,7 @@ clean_misc:
883842 rm -fr check_* .dir
884843 rm -f * .o * .out $( TIME_T_ALTERNATIVES) \
885844 check_* core typecheck_* \
886- date tzselect version.h zdump zic yearistype libtz.a
845+ date tzselect version.h zdump zic libtz.a
887846clean: clean_misc
888847 rm -fr * .dir tzdb-* /
889848 rm -f * .zi $( TZS_NEW)
0 commit comments