--- a/components/mpc/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/mpc/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
@@ -37,9 +37,9 @@
 
 TPNO=			4706
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 export SHELL
 SHELL=/bin/sh
@@ -50,8 +50,6 @@
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		--disable-static
 
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:	$(BUILD_32_and_64)
 
@@ -62,6 +60,8 @@
 		@cd $(BUILD_DIR_32)/tests; $(MAKE) check
 		@cd $(BUILD_DIR_64)/tests; $(MAKE) check
  
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/gmp
+REQUIRED_PACKAGES += library/mpfr
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math