--- old/jdk/make/lib/Lib-java.instrument.gmk	2014-09-24 14:35:45.287604031 +0200
+++ new/jdk/make/lib/Lib-java.instrument.gmk	2014-09-24 14:35:45.027602519 +0200
@@ -28,7 +28,7 @@
 ################################################################################
 
 LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/java.instrument/share/native/libinstrument \
-    $(JDK_TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_API_DIR)/native/libinstrument \
+    $(JDK_TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_TYPE)/native/libinstrument \
     #
 LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
     $(addprefix -I, $(LIBINSTRUMENT_SRC)) \