make/gensrc/GensrcCLDR.gmk

rev 49587 : imported patch 8201507

*** 33,42 ****
--- 33,43 ----
  CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo.java
  
  CLDR_BASE_LOCALES := "en-US"
  
  ZONENAME_TEMPLATE := $(TOPDIR)/src/java.base/share/classes/java/time/format/ZoneName.java.template
+ TZDATA_DIR := $(TOPDIR)/make/data/tzdata
  
  $(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
      $(wildcard $(CLDRSRCDIR)/common/main/en*.xml) \
      $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
      $(ZONENAME_TEMPLATE) \
*** 44,54 ****
          $(MKDIR) -p $(GENSRC_BASEDIR)
          $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \
              -baselocales $(CLDR_BASE_LOCALES) \
              -o $(GENSRC_BASEDIR) \
              -basemodule \
!             -zntempfile $(ZONENAME_TEMPLATE)
  
  $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
      $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
      $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
      $(BUILD_TOOLS_JDK)
--- 45,56 ----
          $(MKDIR) -p $(GENSRC_BASEDIR)
          $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \
              -baselocales $(CLDR_BASE_LOCALES) \
              -o $(GENSRC_BASEDIR) \
              -basemodule \
!             -zntempfile $(ZONENAME_TEMPLATE) \
!             -tzdatadir $(TZDATA_DIR)
  
  $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
      $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
      $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
      $(BUILD_TOOLS_JDK)