--- a/components/open-fabrics/infiniband-diags/Makefile	Thu Jul 16 15:20:48 2015 -0700
+++ b/components/open-fabrics/infiniband-diags/Makefile	Fri Jul 17 12:11:28 2015 -0700
@@ -22,7 +22,7 @@
 #
 
 # OFED only builds with GCC
-COMPILER=gcc3
+COMPILER=gcc
 
 include ../../../make-rules/shared-macros.mk
 
@@ -50,6 +50,8 @@
 
 CONFIGURE_ENV +=	PERL=$(PERL)
 
+CONFIGURE_OPTIONS +=	--sbindir=$(USRSBINDIR)
+
 # it apears that configure is broken
 COMPONENT_BUILD_ARGS  +=	LIBS="$(LIBS)"
 
@@ -81,11 +83,11 @@
 	$(INSTALL) -m 644 manpages/set_nodedesc.sh.1m $(PROTOMAN)/man1m
 
 # common targets
-configure:	$(CONFIGURE_32)
+configure:	$(CONFIGURE_32_and_64)
 
-build:		$(BUILD_32)
+build:		$(BUILD_32_and_64)
 
-install:	$(INSTALL_32) #$(PROTOMAN1MFILES)
+install:	$(INSTALL_32_and_64) #$(PROTOMAN1MFILES)
 
 test:		$(NO_TESTS)