--- a/components/ggrep/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/ggrep/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -36,9 +36,9 @@
 
 TPNO=			8710
 
-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
 
 # We need to be able to return from void functions
 CFLAGS	+=			$(studio_FEATURES_EXTENSIONS)
@@ -64,6 +64,6 @@
 # test-mbrtowc3.sh, test-mbrtowc4.sh, test-mbsrtowcs4.sh
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/pcre
+REQUIRED_PACKAGES += system/library