--- a/components/php-5_2/php-nsapi/Makefile	Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/php-nsapi/Makefile	Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -54,6 +54,7 @@
 include ../php-sapi/php.mk
 
 COMPONENT_POST_UNPACK_ACTION += && ( \
+	set -e; \
 	$(RM) -r $(COMPONENT_DIR)/$(COMPONENT_SRC_1); \
 	cd $(COMPONENT_DIR); \
 	$(UNPACK) $(UNPACK_ARGS) ./$(COMPONENT_ARCHIVE_1); \
@@ -93,6 +94,7 @@
 CONFIGURE_ENV += $(ZTS_CONF_ENVLINE)
 
 COMPONENT_POST_BUILD_ACTION = ( \
+	set -e; \
 	cat $(BUILD_DIR_32)/scripts/phpize | \
 	 sed -e "s,^\#!/bin/sh,\#!$(CONFIG_SHELL)," | \
 	 sed -e "s%^prefix=.*%prefix=$(SOURCE_DIR)%" | \
@@ -104,12 +106,14 @@
 	chmod 755 phpize-proto.zts )
 
 ADD_NSAPI_MODULE_SUPPORT = ( \
+	set -e; \
 	$(MKDIR) $(PROTO_DIR)/$(TOP_DIR)/nsapi/; \
 	$(CP) $(BUILD_DIR_32)/libs/libphp5.so \
 		$(PROTO_DIR)/$(TOP_DIR)/nsapi/libphp5.so; \
 	)
 
 FIX_CONFIG_FILES = ( \
+	set -e; \
 	cd $(COMPONENT_DIR); \
 	$(GSED) -e "s@extension_dir = \(.*\)@extension_dir=$(PHP_ROOT_ZTS_EXT)@"< ../php-sapi/build/prototype/$(MACH)/$(CONFDIR)/php.ini > php.ini; \
 	$(MKDIR) $(PROTO_DIR)/$(NSAPI_CONFDIR); \
@@ -119,6 +123,7 @@
 COMPONENT_INSTALL_TARGETS = libphp5.la install-modules
 
 COMPONENT_POST_INSTALL_ACTION = ( \
+	set -e; \
 	$(ADD_NSAPI_MODULE_SUPPORT); \
 	$(FIX_CONFIG_FILES); \
 	)