--- a/components/python/xattr/Makefile	Thu Apr 16 01:36:32 2015 -0700
+++ b/components/python/xattr/Makefile	Mon Apr 20 12:35:51 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -35,24 +35,16 @@
 COMPONENT_PROJECT_URL=	http://github.com/xattr/xattr
 COMPONENT_BUGDB=	python-mod/xattr
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/setup.py.mk
-include $(WS_TOP)/make-rules/ips.mk
+TPNO=			16912
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Look over into the pycparser and cffi proto areas until they're available in
-# the build environment.  Make sure that cffi is built.
-PYCPARSER =		$(WS_COMPONENTS)/python/pycparser/build/prototype/$(MACH)/$(PYTHON_LIB)
-CFFI =			$(WS_COMPONENTS)/python/cffi/build/prototype/$(MACH)/$(PYTHON_LIB)
-
-$(CFFI):
-	(cd ../cffi; $(MAKE) install)
-
-PYTHONPATH_DEP =	$(PYCPARSER):$(CFFI)
-COMPONENT_BUILD_ENV +=	PYTHONPATH=$(PYTHONPATH_DEP)
-COMPONENT_INSTALL_ENV +=	PYTHONPATH=$(PYTHONPATH_DEP):$(PROTO_DIR)/$(PYTHON_LIB)
-COMPONENT_TEST_ENV +=	PYTHONPATH=$(PYTHONPATH_DEP):$(PROTO_DIR)/$(PYTHON_LIB)
+COMPONENT_INSTALL_ENV +=	PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB)
+COMPONENT_TEST_ENV +=		PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB)
 # The test suite wants to use some unicode filenames, which don't work in the C
 # locale.
 COMPONENT_TEST_ENV +=	LC_CTYPE=en_US.UTF-8
@@ -71,8 +63,6 @@
 # finding in PYTHONPATH.
 COMPONENT_PRE_TEST_ACTION = $(CP) -r $(SOURCE_DIR) $(@D)/tests
 
-$(BUILD_32_and_64): $(CFFI)
-
 # common targets
 build:		$(BUILD_32_and_64)