diff -r 71c04702a3d5 -r 72e3ae9a25eb make/lib/Lib-java.rmi.gmk
--- a/make/lib/Lib-java.rmi.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/lib/Lib-java.rmi.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -30,10 +30,10 @@
 $(eval $(call SetupNativeCompilation,BUILD_LIBRMI, \
     LIBRARY := rmi, \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-    SRC := $(JDK_TOPDIR)/src/java.rmi/share/native/librmi, \
+    SRC := $(TOPDIR)/src/java.rmi/share/native/librmi, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.rmi, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/librmi/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/librmi/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \