--- a/make/lib/Lib-jdk.pack.gmk	Tue Mar 13 11:32:32 2018 +0100
+++ b/make/lib/Lib-jdk.pack.gmk	Tue Mar 13 14:33:34 2018 +0100
@@ -27,9 +27,8 @@
 
 ################################################################################
 
-$(eval $(call SetupNativeCompilation, BUILD_LIBUNPACK, \
+$(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
     NAME := unpack, \
-    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
     SRC := $(TOPDIR)/src/jdk.pack/share/native/libunpack \
         $(TOPDIR)/src/jdk.pack/share/native/common-unpack, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
@@ -47,12 +46,6 @@
     LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \
     LIBS_unix := -ljvm $(LIBCXX) -ljava -lc, \
     LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \
-    OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libunpack, \
-    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
-    RC_FLAGS := $(RC_FLAGS) \
-        -D "JDK_FNAME=unpack.dll" \
-        -D "JDK_INTERNAL_NAME=unpack" \
-        -D "JDK_FTYPE=0x2L", \
 ))
 
 $(BUILD_LIBUNPACK): $(call FindLib, java.base, java)