Fix a couple of places where headers didn't get installed correctly when

--with-devel-headers is given to configure:
  * allocator, rcache, and mpool were putting things in the wrong place
  * timer wasn't installing the inline implementations at all

This commit was SVN r7805.

ompi/mca/allocator/Makefile.am

@@ -25,7 +25,7 @@ headers = allocator.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/opal/mca/allocator
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/allocator/base/Makefile.am

@@ -31,7 +31,7 @@ libmca_allocator_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/allocator/base
+ompidir = $(includedir)/openmpi/ompi/mca/allocator/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/mpool/Makefile.am

@@ -25,7 +25,7 @@ headers = mpool.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/opal/mca/mpool
+ompidir = $(includedir)/openmpi/ompi/mca/mpool
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/mpool/base/Makefile.am

@@ -36,7 +36,7 @@ libmca_mpool_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/mpool/base
+ompidir = $(includedir)/openmpi/ompi/mca/mpool/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/rcache/Makefile.am

@@ -23,7 +23,7 @@ headers = rcache.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/opal/mca/rcache
+ompidir = $(includedir)/openmpi/ompi/mca/rcache
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/rcache/base/Makefile.am

@@ -32,7 +32,7 @@ libmca_rcache_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rcache/base
+ompidir = $(includedir)/openmpi/ompi/mca/rcache/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

opal/mca/timer/base/Makefile.am

@@ -32,8 +32,10 @@ libmca_timer_base_la_SOURCES = \
 if WANT_INSTALL_HEADERS
 ompidir = $(includedir)/openmpi/opal/mca/timer/base
 ompi_HEADERS = $(headers)
+nodist_ompi_HEADERS = base_impl.h
 else
 ompidir = $(includedir)
+nodist_ompi_HEADERS = 
 endif
 
 distclean-local: