--- a/components/novnc/Makefile Thu Mar 19 14:35:58 2015 -0700
+++ b/components/novnc/Makefile Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -34,8 +34,8 @@
TPNO= 18799
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
@@ -49,6 +49,5 @@
clean::
$(RM) -r $(BUILD_DIR)
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
-include $(WS_TOP)/make-rules/depend.mk
+REQUIRED_PACKAGES += consolidation/userland/userland-incorporation