@@ -455,14 +455,15 @@ WEB_PAGES= tz-art.html tz-how-to.html tz-link.html
455455DOCS= $( MANS) date.1 $( MANTXTS) $( WEB_PAGES)
456456PRIMARY_YDATA= africa antarctica asia australasia \
457457 europe northamerica southamerica
458- YDATA= $( PRIMARY_YDATA) etcetera $( BACKWARD )
458+ YDATA= $( PRIMARY_YDATA) etcetera
459459NDATA= systemv factory
460- TDATA= $( YDATA) $( NDATA)
460+ TDATA_TO_CHECK= $( YDATA) $( NDATA) backward pacificnew
461+ TDATA= $( YDATA) $( NDATA) $( BACKWARD)
461462ZONETABLES= zone1970.tab zone.tab
462463TABDATA= iso3166.tab $( TZDATA_TEXT) $( ZONETABLES)
463464LEAP_DEPS= leapseconds.awk leap-seconds.list
464465TZDATA_ZI_DEPS= zishrink.awk version $( TDATA) $( PACKRATDATA)
465- DATA= $( YDATA ) $( NDATA ) backzone iso3166.tab leap-seconds.list \
466+ DATA= $( TDATA_TO_CHECK ) backzone iso3166.tab leap-seconds.list \
466467 leapseconds yearistype.sh $( ZONETABLES)
467468AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk zishrink.awk
468469MISC= $( AWK_SCRIPTS) zoneinfo2tdf.pl
@@ -670,22 +671,24 @@ check_character_set: $(ENCHILADA)
670671 $( MISC) $( SOURCES) $( WEB_PAGES) \
671672 CONTRIBUTING LICENSE Makefile README \
672673 version tzdata.zi && \
673- ! grep -Env $( SAFE_SHARP_LINE) $( TDATA ) backzone \
674+ ! grep -Env $( SAFE_SHARP_LINE) $( TDATA_TO_CHECK ) backzone \
674675 leapseconds yearistype.sh zone.tab && \
675676 ! grep -Env $( OK_LINE) $( ENCHILADA) ; \
676677 }
677678
678679check_white_space: $( ENCHILADA)
679680 patfmt=' \t|[\f\r\v]' && pat= ` printf "$$patfmt\\n"` && \
680681 ! grep -En " $$ pat" $( ENCHILADA)
681- ! grep -n ' [[:space:]]$$' $( ENCHILADA)
682+ ! grep -n ' [[:space:]]$$' \
683+ $$ (ls $( ENCHILADA) | grep -Fvx leap-seconds.list)
682684
683685PRECEDES_FILE_NAME = ^(Zone| Link[[:space:]]+[^[:space:]]+)[[:space:]]+
684686FILE_NAME_COMPONENT_TOO_LONG = \
685687 $( PRECEDES_FILE_NAME) [^[:space:]]* [^/[:space:]]{15}
686688
687- check_name_lengths: $( TDATA) backzone
688- ! grep -En ' $(FILE_NAME_COMPONENT_TOO_LONG)' $( TDATA) backzone
689+ check_name_lengths: $( TDATA_TO_CHECK) backzone
690+ ! grep -En ' $(FILE_NAME_COMPONENT_TOO_LONG)' \
691+ $( TDATA_TO_CHECK) backzone
689692
690693CHECK_CC_LIST = { n = split($$ 1,a,/,/); for (i=2; i< =n; i++) print a[1], a[i]; }
691694
@@ -699,8 +702,8 @@ check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
699702 $( AWK) ' /^[^#]/ $(CHECK_CC_LIST)' zone1970.tab | \
700703 LC_ALL= C sort -c u
701704
702- check_links: checklinks.awk $( TDATA )
703- $( AWK) -f checklinks.awk $( TDATA )
705+ check_links: checklinks.awk $( TDATA_TO_CHECK )
706+ $( AWK) -f checklinks.awk $( TDATA_TO_CHECK )
704707 $( AWK) -f checklinks.awk tzdata.zi
705708
706709check_tables: checktab.awk $( PRIMARY_YDATA) $( ZONETABLES)
@@ -803,10 +806,10 @@ check_public:
803806 $(MAKE) maintainer-clean
804807 $(MAKE) CFLAGS=' $( GCC_DEBUG_FLAGS) ' ALL
805808 mkdir -p public.dir
806- for i in $(TDATA ) tzdata.zi; do \
809+ for i in $(TDATA_TO_CHECK ) tzdata.zi; do \
807810 $(zic) -v -d public.dir $$i 2>&1 || exit; \
808811 done
809- $(zic) -v -d public.dir $(TDATA )
812+ $(zic) -v -d public.dir $(TDATA_TO_CHECK )
810813 rm -fr public.dir
811814
812815# Check that the code works under various alternative
0 commit comments