--- a/components/php-5_3/php-cgi/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/php-5_3/php-cgi/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -34,9 +34,9 @@
 
 include ../php-sapi/php.mk
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 include ../common.mk
 
@@ -66,6 +66,4 @@
 # php-sapi does the publish
 publish:	install
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include $(WS_TOP)/make-rules/depend.mk