--- a/components/open-fabrics/infiniband-diags/Makefile	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/open-fabrics/infiniband-diags/Makefile	Wed Mar 30 13:33:31 2016 -0700
@@ -18,31 +18,26 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-
-# OFED only builds with GCC
-COMPILER=gcc
-
-include ../../../make-rules/shared-macros.mk
+BUILD_BITS= 64_and_32
+include ../ofed-component-macros.mk
 
 COMPONENT_NAME=		infiniband-diags
 COMPONENT_VERSION=	1.5.8
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:0baf6694d54602a66dfc2b82a765c933b24534fd8e2bda7e9b89abf503b29c02
 COMPONENT_ARCHIVE_URL=	http://www.openfabrics.org/downloads/management/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/ofuv_tools
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include ../ofed.mk
+INSTALL_TARGET=
+include ../ofed-component.mk
 
-MAN8FILES = set_nodedesc.sh.8
+CFLAGS += -I$(PROTOUSRINCDIR)/infiniband
 
-CFLAGS += -I$(PROTO_DIR)/usr/include/infiniband
-LIBS +=	-lsocket -lnsl -lopensm -losmvendor -losmcomp -libumad -libmad -libverbs -ldevinfo
+LIBS +=	-lopensm -losmvendor -losmcomp -libumad -libmad -libverbs -ldevinfo
 
 COMPONENT_PREP_ACTION = \
         cp solaris_set_nodedesc.c $(@D)/src
@@ -51,8 +46,6 @@
 
 CONFIGURE_ENV +=	PERL=$(PERL.5.12)
 
-CONFIGURE_OPTIONS +=	--sbindir=$(USRSBINDIR)
-
 # it apears that configure is broken
 COMPONENT_BUILD_ARGS  +=	LIBS="$(LIBS)"
 
@@ -62,8 +55,6 @@
 COMPONENT_POST_CONFIGURE_ACTION=\
 	$(SYMLINK) ../../../$(COMPONENT_SRC)/scripts/IBswcountlimits.pm $(@D)/scripts
 
-PROTOMAN = $(PROTO_DIR)/$(CONFIGURE_MANDIR)
-
 CLEANUP_FILES =\
 	$(PROTO_DIR)/$(CONFIGURE_LIBDIR.32)/libibnetdisc.la\
 	$(PROTO_DIR)/$(CONFIGURE_LIBDIR.32)/libibnetdisc.so \
@@ -72,24 +63,17 @@
 	$(PROTOUSRBINDIR)/dump_mfts.sh\
 	$(PROTOUSRBINDIR)/ibidsverify.pl \
 	$(PROTOUSRBINDIR)/ibfindnodesusing.pl\
-	$(PROTOMAN)/man8/vendstat.8 \
-	$(PROTOMAN)/man8/dump_lfts.8 \
-	$(PROTOMAN)/man8/dump_mfts.8 \
-	$(PROTOMAN)/man8/ibidsverify.8 \
-	$(PROTOMAN)/man8/ibfindnodesusing.8 \
+	$(PROTOUSRSHAREMAN8DIR)/vendstat.8 \
+	$(PROTOUSRSHAREMAN8DIR)/dump_lfts.8 \
+	$(PROTOUSRSHAREMAN8DIR)/dump_mfts.8 \
+	$(PROTOUSRSHAREMAN8DIR)/ibidsverify.8 \
+	$(PROTOUSRSHAREMAN8DIR)/ibfindnodesusing.8 \
 	$(PROTOUSRINCDIR)/infiniband/ibnetdisc.h\
 
 COMPONENT_POST_INSTALL_ACTION =\
 	$(RM) $(CLEANUP_FILES);\
-	$(INSTALL) -m 644 manpages/set_nodedesc.sh.8 $(PROTOMAN)/man8
+	$(INSTALL) -m 644 manpages/set_nodedesc.sh.8 $(PROTOUSRSHAREMAN8DIR)
 
 # common targets
-configure:	$(CONFIGURE_32_and_64)
-
-build:		$(BUILD_32_and_64)
-
 install:	$(INSTALL_32_and_64) #$(PROTOMAN8FILES)
 
-test:		$(NO_TESTS)
-
-system-test:    $(NO_TESTS)