diff -r 8a0caceb319b -r 8c9bd4be4a86 jdk/make/gensrc/GensrcIcons.gmk
--- a/jdk/make/gensrc/GensrcIcons.gmk	Fri Nov 14 13:46:19 2014 -0800
+++ b/jdk/make/gensrc/GensrcIcons.gmk	Fri Nov 21 16:05:11 2014 +0100
@@ -29,9 +29,9 @@
 GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/java.desktop/sun/awt/
 
 ifdef OPENJDK
-  X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)
+  X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
 else
-  X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)
+  X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
 endif
 
 GENSRC_AWT_ICONS_SRC += \