From c7b43102bc89a4aedd9bad7b14bb831753febb6e Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Mon, 24 Nov 2014 11:40:49 +0100
Subject: [PATCH] 8065412: generated source to compile .properties file
 incorreectly includes the module name in the package name

Reviewed-by: tbell, mchung, ihse
---
 jdk/make/gensrc/GensrcProperties.gmk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jdk/make/gensrc/GensrcProperties.gmk b/jdk/make/gensrc/GensrcProperties.gmk
index 0b0520c6fd9..6d7e1cc8489 100644
--- a/jdk/make/gensrc/GensrcProperties.gmk
+++ b/jdk/make/gensrc/GensrcProperties.gmk
@@ -58,13 +58,15 @@ define SetupCompileProperties
   $1_CLASS := $3
 
   # Convert .../src/<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
-  # to .../langtools/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java
+  # to .../support/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java
   # Strip away prefix and suffix, leaving for example only: 
   # "<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN"
   $1_JAVAS := $$(patsubst $(JDK_TOPDIR)/src/%, \
       $(JDK_OUTPUTDIR)/gensrc/%, \
       $$(patsubst %.properties, %.java, \
-      $$(subst /share/classes,, $$($1_SRCS))))
+      $$(subst /$(OPENJDK_TARGET_OS)/classes,, \
+      $$(subst /$(OPENJDK_TARGET_OS_TYPE)/classes,, \
+      $$(subst /share/classes,, $$($1_SRCS))))))
 
   # Generate the package dirs for the to be generated java files. Sort to remove
   # duplicates.