--- a/components/tomcat/Makefile Thu Mar 19 14:35:58 2015 -0700
+++ b/components/tomcat/Makefile Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -52,9 +52,9 @@
TPNO= 17997
-include ../../make-rules/prep.mk
-include ../../make-rules/ant.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ant.mk
+include $(WS_MAKE_RULES)/ips.mk
COMPONENT_BUILD_ARGS=-Dbase.path=$(BUILD_DIR_32) -Dtomcat.build=$(PROTO_DIR)
COMPONENT_BUILD_TARGETS=download deploy
@@ -74,6 +74,8 @@
@cd $(BUILD_DIR_32)/test; $(ENV) $(COMPONENT_BUILD_ENV) \
$(ANT) $(COMPONENT_BUILD_ARGS) -Djunit.home=/usr/share/lib/java
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/java/jre-7
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/network