makefiles/GensrcIcons.gmk

@@ -27,11 +27,11 @@
 GENSRC_ICONS_SRC :=
 GENSRC_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc_icons
 GENSRC_ICONS_DST := $(GENSRC_ICONS_TMP)/sun/awt/X11
 
 ifdef OPENJDK
-        ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)
+        ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)
 else
         ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/solaris
 endif
 
 GENSRC_ICONS_SRC += \

@@ -39,11 +39,11 @@
     $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \
     $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \
     $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
 
 
-ICONPATH := $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes/sun/awt/X11
+ICONPATH := $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes/sun/awt/X11
 
 GENSRC_ICONS_SRC += \
    $(ICONPATH)/security-icon-bw16.png \
    $(ICONPATH)/security-icon-interim16.png \
    $(ICONPATH)/security-icon-yellow16.png \

@@ -84,11 +84,11 @@
         $(RM) $$@ $$@.tmp
         $(ECHO) "package sun.awt.X11;" > $$@.tmp
         $(ECHO) "public class $$($1_NAME32) {" >> $$@.tmp
         $(ECHO) "public static int[] $$($1_SHORTNAME) = { " >> $$@.tmp
 # TODO FIX FIX FIX
-ifneq ($(PLATFORM),macosx)
+ifneq ($(OPENJDK_TARGET_OS),macosx)
         $(CAT) $$< | $(TOOL_TOBIN) >> $$@.tmp
 endif
         $(ECHO) "}; }" >> $$@.tmp
         $(MV) $$@.tmp $$@
 

@@ -98,11 +98,11 @@
         $(RM) $$@ $$@.tmp
         $(ECHO) "package sun.awt.X11;" > $$@.tmp
         $(ECHO) "public class $$($1_NAME64) {" >> $$@.tmp
         $(ECHO) "public static long[] $$($1_SHORTNAME) = { " >> $$@.tmp
 # TODO FIX FIX FIX
-ifneq ($(PLATFORM),macosx)
+ifneq ($(OPENJDK_TARGET_OS),macosx)
         $(CAT) $$< | $(TOOL_TOBIN) >> $$@.tmp
 endif
         $(ECHO) "}; }" >> $$@.tmp
         $(MV) $$@.tmp $$@