--- old/jdk/make/gensrc/GensrcProperties.gmk	2014-09-24 14:35:41.227580403 +0200
+++ new/jdk/make/gensrc/GensrcProperties.gmk	2014-09-24 14:35:40.387575517 +0200
@@ -40,7 +40,7 @@
   $1_PROPJAVAS := $$(patsubst $(JDK_TOPDIR)/src/%.properties, \
       $(JDK_OUTPUTDIR)/gensrc/%.java, \
       $$(subst /share/classes,, \
-      $$(subst /$(OPENJDK_TARGET_OS_API_DIR)/classes,, \
+      $$(subst /$(OPENJDK_TARGET_OS_TYPE)/classes,, \
       $$(subst /$(OPENJDK_TARGET_OS)/classes,, $2))))
 
   # Accumulate all found properties files.