* change the location of the C++ MPI headers from $includedir/ompi/... to

$includedir/openmpi/... to match the rest of the things we install

This commit was SVN r2842.

src/mpi/cxx/Makefile.am

@@ -48,7 +48,7 @@ headers = \
         errhandler_inln.h \
         status_inln.h
 
-ompidir = $(includedir)/ompi/mpi/cxx
+ompidir = $(includedir)/openmpi/mpi/cxx
 ompi_HEADERS = \
 	$(headers)
 else

src/tools/wrappers/wrap.cc

@@ -223,7 +223,7 @@ ompi_wrap_build_cflags(bool want_f77_includes, ompi_sv_t& cflags)
   }
 
 #if OMPI_WANT_CXX_BINDINGS
-  cflags.push_back("-I" + incdir + "/ompi");
+  cflags.push_back("-I" + incdir + "/openmpi");
 #endif
 
 #if defined(WIN32) && WIN32