--- a/jdk/make/Import.gmk Fri Nov 14 13:46:19 2014 -0800
+++ b/jdk/make/Import.gmk Fri Nov 21 16:05:11 2014 +0100
@@ -30,8 +30,8 @@
################################################################################
-# Put the libraries here. Different locations for different target apis.
-ifeq ($(OPENJDK_TARGET_OS_API), posix)
+# Put the libraries here. Different locations for different target OS types.
+ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)
else