--- a/components/python/cheetah/Makefile Thu Mar 19 14:35:58 2015 -0700
+++ b/components/python/cheetah/Makefile Thu Mar 19 20:44:31 2015 -0700
@@ -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
COMPONENT_POST_INSTALL_ACTION = \
(cd $(PROTO_DIR)/usr/bin ; \
@@ -60,6 +60,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