diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_3/php-sapi/Makefile --- a/components/php-5_3/php-sapi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_3/php-sapi/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 @@ -60,9 +60,9 @@ include ./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 @@ -260,7 +260,3 @@ $(BUILD_DIR_32)/.configured: ../imap/build/$(MACH32)/.built PHP-NSAPI_INSTALL: ../php-nsapi/build/$(MACH32)/.installed PHP-CGI_INSTALL: ../php-cgi/build/$(MACH32)/.installed - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk