diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -172,9 +172,9 @@ EXPIRES_LINE= 0 TZDATA_TEXT= leapseconds tzdata.zi -# For backward-compatibility links for old zone names, use +# For backward-compatibility links and zones for old names, use # BACKWARD= backward -# To omit these links, use +# To omit these links and zones, use # BACKWARD= BACKWARD= backward @@ -574,7 +574,7 @@ SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]' # These non-alphabetic, non-ASCII printable characters are # used in commentary or in generated *.txt files # and are not likely to cause confusion. -UNUSUAL_OK_CHARSET= §«°±»½¾×–‘’“”•→−≤★⟨⟩⯪ +UNUSUAL_OK_CHARSET= §«°±»½¾¿×–‘’“”•→−≤★⟨⟩⯪ # Put this in a bracket expression to match spaces. s = [:space:] @@ -922,7 +922,7 @@ check_mild: check_web check_zishrink \ UTF8_LOCALE_MISSING = \ { test ! '$(UTF8_LOCALE)' \ || ! printf 'A\304\200B\n' \ - | LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 \ + | LC_ALL='$(UTF8_LOCALE)' grep -q '^A[[:alpha:]]B$$' >/dev/null 2>&1 \ || { export LC_ALL='$(UTF8_LOCALE)'; false; }; } character-set.ck: $(ENCHILADA) @@ -1006,11 +1006,11 @@ now.ck: checknow.awk date tzdata.zi zdump zic zone1970.tab zonenow.tab now=$(CHECK_NOW_TIMESTAMP) && \ future=$$(($(CHECK_NOW_FUTURE_SECS) + $$now)) && \ ./zdump -i -t $$now,$$future \ - $$(find "$$PWD/$@d"/????*/ -type f) \ + $$(find "$$PWD/$@d"/????*/ -type f -o -type l) \ >$@d/zdump-now.tab && \ ./zdump -i -t 0,$$future \ $$(find "$$PWD/$@d" -name Etc -prune \ - -o -type f ! -name '*.tab' -print) \ + -o \( -type f -o -type l \) ! -name '*.tab' -print) \ >$@d/zdump-1970.tab && \ $(AWK) \ -v now=$$now \ @@ -1018,7 +1018,12 @@ now.ck: checknow.awk date tzdata.zi zdump zic zone1970.tab zonenow.tab -v zdump_table=$@d/zdump-now.tab \ -f checknow.awk zonenow.tab $(AWK) \ - 'BEGIN {print "-\t-\tUTC"} /^Zone/ {print "-\t-\t" $$2}' \ + 'BEGIN { \ + SysVzone["EST5EDT"] = 1; SysVzone["CST6CDT"] = 1; \ + SysVzone["MST7MDT"] = 1; SysVzone["PST8PDT"] = 1; \ + print "-\t-\tUTC" \ + } \ + $$1 == "Zone" && !SysVzone[$$2] {print "-\t-\t" $$2}' \ $(PRIMARY_YDATA) backward factory | \ $(AWK) \ -v zdump_table=$@d/zdump-1970.tab \ |