Index: head/contrib/ofed/infiniband-diags/build/Makefile.inc
===================================================================
--- head/contrib/ofed/infiniband-diags/build/Makefile.inc	(revision 326562)
+++ head/contrib/ofed/infiniband-diags/build/Makefile.inc	(revision 326563)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../src ${.CURDIR}/../../man
 
 BINDIR?= /usr/bin
 SRCS+= ibdiag_common.c ibdiag_sa.c
-CFLAGS+= -I${INCLUDEDIR}/infiniband
+CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
 CFLAGS+= -DHAVE_CONFIG_H=1
 CFLAGS+= -I${.CURDIR}/../../
 CFLAGS+= -I${.CURDIR}/../../src
 LIBADD+= osmcomp ibmad ibumad
 
Index: head/contrib/ofed/libibnetdisc/Makefile
===================================================================
--- head/contrib/ofed/libibnetdisc/Makefile	(revision 326562)
+++ head/contrib/ofed/libibnetdisc/Makefile	(revision 326563)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR} ${.CURDIR}/man
 
 SHLIBDIR?=	/usr/lib
 LIB_CXX=	ibnetdisc
 SHLIB_MAJOR=	5
 MK_PROFILE=	no
 
 SRCS= \
 chassis.c \
 g_hash_table.cpp \
 ibnetdisc.c \
 ibnetdisc_cache.c \
 query_smp.c
 
 MAN= \
 ibnd_debug.3 \
 ibnd_destroy_fabric.3 \
 ibnd_discover_fabric.3 \
 ibnd_find_node_dr.3 \
 ibnd_find_node_guid.3 \
 ibnd_iter_nodes.3 \
 ibnd_iter_nodes_type.3 \
 ibnd_show_progress.3
 
 LIBADD=		osmcomp ibmad ibumad
 CFLAGS+=	-DHAVE_CONFIG_H=1
 CFLAGS+=	-I${.CURDIR}
-CFLAGS+=	-I${INCLUDEDIR}/infiniband
+CFLAGS+=	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
 VERSION_MAP=	${.CURDIR}/libibnetdisc.map
 
 .include <bsd.lib.mk>
Index: head/contrib/ofed/opensm/complib/Makefile
===================================================================
--- head/contrib/ofed/opensm/complib/Makefile	(revision 326562)
+++ head/contrib/ofed/opensm/complib/Makefile	(revision 326563)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}
 
 SHLIBDIR?=	/usr/lib
 LIB=		osmcomp
 SHLIB_MAJOR=    3
 MK_PROFILE=     no
 
 SRCS= \
 cl_complib.c \
 cl_dispatcher.c \
 cl_event.c \
 cl_event_wheel.c \
 cl_list.c \
 cl_log.c \
 cl_map.c \
 cl_nodenamemap.c \
 cl_pool.c \
 cl_ptr_vector.c \
 cl_spinlock.c \
 cl_statustext.c \
 cl_thread.c \
 cl_threadpool.c \
 cl_timer.c \
 cl_vector.c \
 ib_statustext.c
 
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
-CFLAGS+=	-I${INCLUDEDIR}/infiniband
+CFLAGS+=	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
 LIBADD=		pthread
 VERSION_MAP=	${.CURDIR}/libosmcomp.map
 
 .include <bsd.lib.mk>
Index: head/contrib/ofed/opensm/libopensm/Makefile
===================================================================
--- head/contrib/ofed/opensm/libopensm/Makefile	(revision 326562)
+++ head/contrib/ofed/opensm/libopensm/Makefile	(revision 326563)
@@ -1,20 +1,20 @@
 # $FreeBSD$
 
 .PATH:	${.CURDIR}/../opensm
 
 SHLIBDIR?=	/usr/lib
 LIB=		opensm
 SHLIB_MAJOR=	5
 MK_PROFILE=	no
 
 SRCS= \
 osm_log.c \
 osm_mad_pool.c \
 osm_helper.c
 
 LIBADD=		pthread
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
-CFLAGS+=	-I${INCLUDEDIR}/infiniband
+CFLAGS+=	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
 VERSION_MAP=	${.CURDIR}/../opensm/libopensm.map
 
 .include <bsd.lib.mk>
Index: head/contrib/ofed/opensm/libvendor/Makefile
===================================================================
--- head/contrib/ofed/opensm/libvendor/Makefile	(revision 326562)
+++ head/contrib/ofed/opensm/libvendor/Makefile	(revision 326563)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 
 .PATH:	${.CURDIR}
 
 SHLIBDIR?=	/usr/lib
 LIB=		osmvendor
 SHLIB_MAJOR=	4
 MK_PROFILE=	no
 
 SRCS= \
 osm_vendor_ibumad.c \
 osm_vendor_ibumad_sa.c
 
 LIBADD=		ibumad pthread
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
-CFLAGS+=	-I${INCLUDEDIR}/infiniband
+CFLAGS+=	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
 VERSION_MAP=	${.CURDIR}/libosmvendor.map
 
 .include <bsd.lib.mk>
Index: head/contrib/ofed/opensm/opensm/Makefile
===================================================================
--- head/contrib/ofed/opensm/opensm/Makefile	(revision 326562)
+++ head/contrib/ofed/opensm/opensm/Makefile	(revision 326563)
@@ -1,101 +1,101 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR} ${.CURDIR}/../man
 
 BINDIR?=	/usr/bin
 PROG=		opensm
 
 SRCS= \
 main.c \
 osm_congestion_control.c \
 osm_console.c \
 osm_console_io.c \
 osm_db_files.c \
 osm_db_pack.c \
 osm_drop_mgr.c \
 osm_dump.c \
 osm_event_plugin.c \
 osm_guid_info_rcv.c \
 osm_guid_mgr.c \
 osm_inform.c \
 osm_lid_mgr.c \
 osm_lin_fwd_rcv.c \
 osm_link_mgr.c \
 osm_mcast_fwd_rcv.c \
 osm_mcast_mgr.c \
 osm_mcast_tbl.c \
 osm_mcm_port.c \
 osm_mesh.c \
 osm_mlnx_ext_port_info_rcv.c \
 osm_mtree.c \
 osm_multicast.c \
 osm_node.c \
 osm_node_desc_rcv.c \
 osm_node_info_rcv.c \
 osm_opensm.c \
 osm_perfmgr.c \
 osm_perfmgr_db.c \
 osm_pkey.c \
 osm_pkey_mgr.c \
 osm_pkey_rcv.c \
 osm_port.c \
 osm_port_info_rcv.c \
 osm_prtn.c \
 osm_prtn_config.c \
 osm_qos.c \
 osm_qos_parser_l.l \
 osm_qos_parser_y.y \
 osm_qos_policy.c \
 osm_remote_sm.c \
 osm_req.c \
 osm_resp.c \
 osm_router.c \
 osm_sa.c \
 osm_sa_class_port_info.c \
 osm_sa_guidinfo_record.c \
 osm_sa_informinfo.c \
 osm_sa_lft_record.c \
 osm_sa_link_record.c \
 osm_sa_mad_ctrl.c \
 osm_sa_mcmember_record.c \
 osm_sa_mft_record.c \
 osm_sa_multipath_record.c \
 osm_sa_node_record.c \
 osm_sa_path_record.c \
 osm_sa_pkey_record.c \
 osm_sa_portinfo_record.c \
 osm_sa_service_record.c \
 osm_sa_slvl_record.c \
 osm_sa_sminfo_record.c \
 osm_sa_sw_info_record.c \
 osm_sa_vlarb_record.c \
 osm_service.c \
 osm_slvl_map_rcv.c \
 osm_sm.c \
 osm_sm_mad_ctrl.c \
 osm_sm_state_mgr.c \
 osm_sminfo_rcv.c \
 osm_state_mgr.c \
 osm_subnet.c \
 osm_sw_info_rcv.c \
 osm_switch.c \
 osm_torus.c \
 osm_trap_rcv.c \
 osm_ucast_cache.c \
 osm_ucast_dfsssp.c \
 osm_ucast_dnup.c \
 osm_ucast_file.c \
 osm_ucast_ftree.c \
 osm_ucast_lash.c \
 osm_ucast_mgr.c \
 osm_ucast_updn.c \
 osm_vl15intf.c \
 osm_vl_arb_rcv.c \
 st.c
 
 MAN=		opensm.8
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
-CFLAGS+=	-I${INCLUDEDIR}/infiniband
+CFLAGS+=	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
 LIBADD=		opensm osmvendor osmcomp wrap pthread
 
 .include <bsd.prog.mk>