--- a/components/erlang/Makefile	Mon Feb 16 13:54:04 2015 -0800
+++ b/components/erlang/Makefile	Sun Feb 15 19:02:09 2015 -0600
@@ -20,9 +20,12 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
+# Built in SFW with gcc and builds cleanly now only with gcc
+COMPILER =	gcc
+
 include ../../make-rules/shared-macros.mk
 
 PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin
@@ -60,9 +63,9 @@
 
 TPNO=			18548
 
-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
 
 # IPS_COMPONENT_VERSION is by default set to $(COMPONENT_VERSION) but it is not
 # enough for us. We need to include the $(COMPONENT_SUBVERSION) somehow.
@@ -71,9 +74,6 @@
 # R(major)(minor)(micro) - (major).(minor as number).(micro)
 IPS_COMPONENT_VERSION=  $(COMPONENT_VERSION_MAJOR).2.3
 
-# Built in SFW with gcc and builds cleanly now only with gcc
-COMPILER =	gcc
-
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS) -I/usr/include/gd2"
 CONFIGURE_OPTIONS += --enable-smp-support
@@ -136,6 +136,11 @@
 
 test:	$(TEST_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker