diff -r 3781477accf3 -r 20c0f21bbe1e components/ruby/facter/Makefile --- a/components/ruby/facter/Makefile Thu Mar 19 14:35:58 2015 -0700 +++ b/components/ruby/facter/Makefile Thu Mar 19 20:44:31 2015 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ COMPONENT_POST_UNPACK_ACTION= \ $(GEM) spec $(COMPONENT_ARCHIVE) > $(SOURCE_DIR)/$(GEMSPEC) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/gem.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/gem.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -54,6 +54,6 @@ # Disable the tests until these rubygems are available. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += runtime/ruby-19 +REQUIRED_PACKAGES += system/core-os