--- a/make/gensrc/GensrcMisc.gmk Tue Sep 12 19:03:39 2017 +0200
+++ b/make/gensrc/GensrcMisc.gmk Tue Sep 12 19:03:56 2017 +0200
@@ -28,7 +28,7 @@
# string and the runtime name into the VersionProps.java file.
$(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
- SOURCE_FILES := $(JDK_TOPDIR)/src/java.base/share/classes/java/lang/VersionProps.java.template, \
+ SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/java/lang/VersionProps.java.template, \
OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/VersionProps.java, \
REPLACEMENTS := \
@@LAUNCHER_NAME@@ => $(LAUNCHER_NAME) ; \
@@ -74,7 +74,7 @@
GENSRC_SOR_FILE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java
$(GENSRC_SOR_FILE): \
- $(JDK_TOPDIR)/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
+ $(TOPDIR)/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
$(generate-preproc-src)
GENSRC_JAVA_BASE += $(GENSRC_SOR_FILE)
@@ -86,7 +86,7 @@
GENSRC_UC_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java
$(GENSRC_UC_FILE): \
- $(JDK_TOPDIR)/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
+ $(TOPDIR)/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
$(generate-preproc-src)
GENSRC_JAVA_BASE += $(GENSRC_UC_FILE)
@@ -100,7 +100,7 @@
GENSRC_SC_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java
$(GENSRC_SC_FILE): \
- $(JDK_TOPDIR)/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
+ $(TOPDIR)/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
$(generate-preproc-src)
GENSRC_JAVA_BASE += $(GENSRC_SC_FILE)
@@ -116,9 +116,9 @@
JCE_DEFAULT_POLICY = limited
endif
-ifneq ($(wildcard $(JDK_TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template), )
+ifneq ($(wildcard $(TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template), )
$(eval $(call SetupTextFileProcessing, BUILD_JCESECURITY_JAVA, \
- SOURCE_FILES := $(JDK_TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template, \
+ SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template, \
OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/javax/crypto/JceSecurity.java, \
REPLACEMENTS := \
@@JCE_DEFAULT_POLICY@@ => $(JCE_DEFAULT_POLICY), \