--- a/make-rules/prep-unpack.mk	Wed Mar 30 10:16:56 2016 -0700
+++ b/make-rules/prep-unpack.mk	Wed Mar 30 13:33:31 2016 -0700
@@ -18,6 +18,8 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
@@ -32,8 +34,8 @@
 
 # Template for unpacking rules.
 define unpack-rules
-ifdef COMPONENT_ARCHIVE$(1)
-ifdef COMPONENT_SRC$(1)
+ifneq ($(strip $(COMPONENT_ARCHIVE$(1))),)
+ifneq ($(strip $(COMPONENT_SRC$(1))),)
 
 CLEAN_PATHS += $$(COMPONENT_SRC$(1))
 SOURCE_DIR$(1) = $$(COMPONENT_DIR)/$(COMPONENT_SRC$(1))