--- a/components/python/cheetah/Makefile Mon Feb 16 13:54:04 2015 -0800
+++ b/components/python/cheetah/Makefile Sun Feb 15 19:02:09 2015 -0600
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -37,9 +37,9 @@
# Syntax issues: not Python 3 ready.
PYTHON_VERSIONS= 2.7 2.6
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/setup.py.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
@@ -62,6 +62,7 @@
test: $(TEST_32_and_64)
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
-include $(WS_TOP)/make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/python-26/tests
+REQUIRED_PACKAGES += runtime/python-27/tests
+REQUIRED_PACKAGES += system/library