--- a/make/gendata/Gendata-java.base.gmk Tue Sep 12 19:03:39 2017 +0200
+++ b/make/gendata/Gendata-java.base.gmk Tue Sep 12 19:03:56 2017 +0200
@@ -26,7 +26,7 @@
include GendataCommon.gmk
# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, gendata/Gendata-java.base.gmk))
+$(eval $(call IncludeCustomExtension, , gendata/Gendata-java.base.gmk))
include GendataBreakIterator.gmk
@@ -40,7 +40,7 @@
GENDATA_UNINAME := $(JDK_OUTPUTDIR)/modules/java.base/java/lang/uniName.dat
-$(GENDATA_UNINAME): $(JDK_TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS_JDK)
+$(GENDATA_UNINAME): $(TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS_JDK)
$(call MakeDir, $(@D))
$(TOOL_CHARACTERNAME) $< $@
@@ -50,7 +50,7 @@
GENDATA_CURDATA := $(JDK_OUTPUTDIR)/modules/java.base/java/util/currency.data
-$(GENDATA_CURDATA): $(JDK_TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK)
+$(GENDATA_CURDATA): $(TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK)
$(call MakeDir, $(@D))
$(RM) $@
$(TOOL_GENERATECURRENCYDATA) -o $@.tmp < $<
@@ -61,7 +61,7 @@
################################################################################
-GENDATA_JAVA_SECURITY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security
+GENDATA_JAVA_SECURITY_SRC := $(TOPDIR)/src/java.base/share/conf/security/java.security
GENDATA_JAVA_SECURITY := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/java.security
ifeq ($(UNLIMITED_CRYPTO), true)