21230525 Add ruby-STOMP module to userland consolidation (fix build/copyright)
20205937 Add Mcollective module to userland consolidation (fix copyright)
--- a/components/ruby/mcollective/Makefile Mon Jan 25 11:02:32 2016 -0800
+++ b/components/ruby/mcollective/Makefile Mon Jan 25 12:08:01 2016 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
--- a/components/ruby/stomp/Makefile Mon Jan 25 11:02:32 2016 -0800
+++ b/components/ruby/stomp/Makefile Mon Jan 25 12:08:01 2016 -0800
@@ -18,13 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/gem.mk
-
COMPONENT_NAME= stomp
COMPONENT_VERSION= 1.3.4
@@ -42,6 +38,10 @@
COMPONENT_POST_UNPACK_ACTION= \
$(GEM) spec $(COMPONENT_ARCHIVE) > $(SOURCE_DIR)/$(GEMSPEC)
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/gem.mk
+
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets