diff -r 60344306d223 -r 30b42c38bbc4 components/ncurses/Makefile --- a/components/ncurses/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ncurses/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 5931 -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 # Needed to make "gmake test" work. COMPONENT_PRE_CONFIGURE_ACTION = \ @@ -83,6 +83,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += system/library