From 2a7f1449bf549bc354de98b8fd87b2018973345d Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Thu, 23 Sep 2004 14:55:04 +0000
Subject: [PATCH] * 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    | 2 +-
 src/tools/wrappers/wrap.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mpi/cxx/Makefile.am b/src/mpi/cxx/Makefile.am
index aab22afde7..85bd89347a 100644
--- a/src/mpi/cxx/Makefile.am
+++ b/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
diff --git a/src/tools/wrappers/wrap.cc b/src/tools/wrappers/wrap.cc
index 46c035bd3d..b4af1c3ccf 100644
--- a/src/tools/wrappers/wrap.cc
+++ b/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