--- a/jdk/make/common/Defs-windows.gmk	Wed Jul 05 16:39:00 2017 +0200
+++ b/jdk/make/common/Defs-windows.gmk	Wed Jul 16 09:51:43 2008 -0700
@@ -404,7 +404,6 @@
 else
   JDK_UPDATE_VER := 0
 endif
-JDK_VER = $(JDK_MINOR_VERSION),$(JDK_MICRO_VERSION),$(JDK_UPDATE_VER),$(COOKED_BUILD_NUMBER)
 
 RC_FLAGS = /l 0x409 /r
 
@@ -414,15 +413,23 @@
   RC_FLAGS += $(MS_RC_DEBUG_OPTION)
 endif 
 
-ifndef COPYRIGHT_YEAR
-    COPYRIGHT_YEAR = 2007 
-endif
+# Values for the RC variables defined in RC_FLAGS
+JDK_RC_BUILD_ID = $(FULL_VERSION)
+JDK_RC_COMPANY = $(COMPANY_NAME)
+JDK_RC_COMPONENT = $(PRODUCT_NAME) $(JDK_RC_PLATFORM_NAME) binary
+JDK_RC_VER = \
+    $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
+JDK_RC_COPYRIGHT = Copyright \xA9 $(COPYRIGHT_YEAR)
+JDK_RC_NAME = \
+    $(PRODUCT_NAME) $(JDK_RC_PLATFORM_NAME) $(JDK_MINOR_VERSION) $(JDK_UPDATE_META_TAG)
+JDK_RC_FVER = \
+    $(JDK_MINOR_VERSION),$(JDK_MICRO_VERSION),$(JDK_UPDATE_VER),$(COOKED_BUILD_NUMBER)
 
 # J2SE name required here
-RC_FLAGS += -d "J2SE_BUILD_ID=$(FULL_VERSION)" \
-            -d "J2SE_COMPANY=$(COMPANY_NAME)" \
-            -d "J2SE_COMPONENT=$(PRODUCT_NAME) Platform SE binary" \
-            -d "J2SE_VER=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)" \
-            -d "J2SE_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \
-            -d "J2SE_NAME=$(PRODUCT_NAME) Platform SE $(JDK_MINOR_VERSION) $(JDK_UPDATE_META_TAG)" \
-            -d "J2SE_FVER=$(JDK_VER)"
+RC_FLAGS += -d "J2SE_BUILD_ID=$(JDK_RC_BUILD_ID)" \
+            -d "J2SE_COMPANY=$(JDK_RC_COMPANY)" \
+            -d "J2SE_COMPONENT=$(JDK_RC_COMPONENT)" \
+            -d "J2SE_VER=$(JDK_RC_VER)" \
+            -d "J2SE_COPYRIGHT=$(JDK_RC_COPYRIGHT)" \
+            -d "J2SE_NAME=$(JDK_RC_NAME)" \
+            -d "J2SE_FVER=$(JDK_RC_FVER)"