hwloc: headers are not in $includedir

They are in $opalincludedir.  Use the neutral "$pkgincludedir", which
will get translated under the covers to opalincludedir.

opal/mca/event/libevent2022/configure.m4

@@ -176,7 +176,7 @@ AC_DEFUN([MCA_opal_event_libevent2022_DO_THE_CONFIG], [
     # Finally, add some flags to the wrapper compiler if we're
     # building with developer headers so that our headers can
     # be found.
-    event_libevent2022_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/openmpi/opal/mca/event/libevent2022/libevent -I${pkgincludedir}/openmpi/opal/mca/event/libevent2022/libevent/include'
+    event_libevent2022_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/opal/mca/event/libevent2022/libevent -I${pkgincludedir}/opal/mca/event/libevent2022/libevent/include'
 
     CFLAGS="$CFLAGS_save"
     CPPFLAGS="$CPPFLAGS_save"

opal/mca/hwloc/hwloc1110/configure.m4

@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 #
-# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
 #
 # $COPYRIGHT$
@@ -158,7 +158,7 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1110_CONFIG],[
         # headers can be found.
         hwloc_hwloc1110_WRAPPER_EXTRA_LDFLAGS="$HWLOC_EMBEDDED_LDFLAGS"
         hwloc_hwloc1110_WRAPPER_EXTRA_LIBS="$HWLOC_EMBEDDED_LIBS"
-        hwloc_hwloc1110_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi/'"$opal_hwloc_hwloc1110_basedir/hwloc/include"
+        hwloc_hwloc1110_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/'"$opal_hwloc_hwloc1110_basedir/hwloc/include"
     fi
 
     # Done!