--- old/make/Import.gmk	2015-01-07 21:18:25.364212332 +0100
+++ new/make/Import.gmk	2015-01-07 21:18:25.003211783 +0100
@@ -223,7 +223,7 @@
 
 # Some platforms don't have the serviceability agent
 ifeq (, $(filter $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), aix-ppc64))
-  ifneq ($(JVM_VARIANT_ZERO), true)
+  ifneq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
     SA_TARGETS += $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/_the.sa.jar.unpacked \
         $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
   endif
--- old/make/copy/Copy-java.base.gmk	2015-01-07 21:18:27.040214882 +0100
+++ new/make/copy/Copy-java.base.gmk	2015-01-07 21:18:26.728214408 +0100
@@ -76,7 +76,7 @@
 #
 # How to install jvm.cfg.
 #
-ifeq ($(JVM_VARIANT_ZERO), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
   JVMCFG_ARCH := zero
 else
   JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
@@ -108,7 +108,7 @@
     COPY_JVM_CFG_FILE := true
   else
     # For zero, the default jvm.cfg file is sufficient
-    ifeq ($(JVM_VARIANT_ZERO), true)
+    ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
       COPY_JVM_CFG_FILE := true
     endif
   endif
--- old/make/gensrc/Gensrc-jdk.jdi.gmk	2015-01-07 21:18:28.362216893 +0100
+++ new/make/gensrc/Gensrc-jdk.jdi.gmk	2015-01-07 21:18:28.099216493 +0100
@@ -80,7 +80,7 @@
 
 # Some platforms don't have the serviceability agent
 ifeq (, $(filter $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), aix-ppc64))
-  ifneq ($(JVM_VARIANT_ZERO), true)
+  ifneq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
     GENSRC_JDK_JDI += $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector \
         $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector
   endif