Fix longstanding issue with our multi-project support. Rather than using

pkg{data,lib,includedir}, use our own ompi{data,lib,includedir}, which is always set to {datadir,libdir,includedir}/openmpi. This will keep us from having help files in prefix/share/open-rte when building without Open MPI, but in prefix/share/openmpi when building with Open MPI. This commit was SVN r30140.
2014-01-07 22:11:15 +00:00 · 2014-01-07 22:11:15 +00:00 · 8b778903d8
commit 8b778903d8
parent c01db6faca
311 changed files with 419 additions and 449 deletions
--- a/configure.ac
+++ b/configure.ac
@ -1318,7 +1318,7 @@ m4_ifdef([project_ompi], [AC_SUBST(FFLAGS)
 #
 # Aggregate MCA parameters directory
 #
-AC_SUBST([AMCA_PARAM_SETS_DIR], ['$(pkgdatadir)/amca-param-sets'])
+AC_SUBST([AMCA_PARAM_SETS_DIR], ['$(ompidatadir)/amca-param-sets'])

 ############################################################################
 # final wrapper compiler config
@ -1396,6 +1396,16 @@ case "`uname`" in
    ;;
 esac

+# ompidatadir, ompilibdir, and ompiinclude are essentially the same as
+# pkg*dir, but will always be */openmpi.  This is to make it a bit
+# easier to deal with the problem of opal, orte, and ompi built from
+# their own tarballs, with their own PACKAGE variables.
+ompidatadir='${datadir}/openmpi'
+ompilibdir='${libdir}/openmpi'
+ompiincludedir='${includedir}/openmpi'
+AC_SUBST(ompidatadir)
+AC_SUBST(ompilibdir)
+AC_SUBST(ompiincludedir)

 ompi_show_subtitle "Final output"

--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@ -99,4 +99,4 @@ EXTRA_DIST = \
 	platform/mellanox/optimized \
 	platform/mellanox/optimized.conf

-dist_pkgdata_DATA = openmpi-valgrind.supp
+dist_ompidata_DATA = openmpi-valgrind.supp
--- a/ompi/Makefile.am
+++ b/ompi/Makefile.am
@ -158,14 +158,14 @@ libmpi_la_LDFLAGS = \
 headers =
 noinst_LTLIBRARIES =
 include_HEADERS =
-dist_pkgdata_DATA =
+dist_ompidata_DATA =
 libmpi_la_SOURCES += $(headers)
 nodist_man_MANS =

 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/datatype/Makefile.am
+++ b/ompi/datatype/Makefile.am
@ -47,6 +47,6 @@ libdatatype_la_LIBADD =

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 ompi_HEADERS = $(headers)
 endif
--- a/ompi/debuggers/Makefile.am
+++ b/ompi/debuggers/Makefile.am
@ -18,7 +18,7 @@
 #

 noinst_LTLIBRARIES = libdebuggers.la libompi_debugger_canary.la
-pkglib_LTLIBRARIES = libompi_dbg_msgq.la
+ompilib_LTLIBRARIES = libompi_dbg_msgq.la

 check_PROGRAMS = predefined_gap_test
 if OPAL_HAVE_DLOPEN
@ -58,7 +58,7 @@ libdebuggers_la_SOURCES = \
        $(headers) \
        ompi_debuggers.c
 libdebuggers_la_CPPFLAGS = \
-        -DOMPI_MSGQ_DLL=\"$(pkglibdir)/$(OPAL_DYN_LIB_PREFIX)ompi_dbg_msgq.$(OPAL_DYN_LIB_SUFFIX)\" \
+        -DOMPI_MSGQ_DLL=\"$(ompilibdir)/$(OPAL_DYN_LIB_PREFIX)ompi_dbg_msgq.$(OPAL_DYN_LIB_SUFFIX)\" \
        -DOMPI_MSGQ_DLL_PREFIX=\"$(OPAL_DYN_LIB_PREFIX)ompi_dbg_msgq\" \
        -DOMPI_MPIHANDLES_DLL_PREFIX=\"$(OPAL_DYN_LIB_PREFIX)ompi_dbg_mpihandles\"

@ -75,6 +75,6 @@ libompi_dbg_msgq_la_LDFLAGS = -module -avoid-version
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 ompi_HEADERS = $(headers)
 endif
--- a/ompi/errhandler/Makefile.am
+++ b/ompi/errhandler/Makefile.am
@ -20,7 +20,7 @@

 # This makefile.am does not stand on its own - it is included from ompi/Makefile.am

-dist_pkgdata_DATA += errhandler/help-mpi-errors.txt
+dist_ompidata_DATA += errhandler/help-mpi-errors.txt

 headers += \
        errhandler/errcode.h \
--- a/ompi/include/Makefile.am
+++ b/ompi/include/Makefile.am
@ -69,7 +69,7 @@ include ompi/Makefile.am
 EXTRA_DIST = $(headers) mpif-values.pl

 if WANT_INSTALL_HEADERS 
-ompidir = $(includedir)/openmpi
+ompidir = $(ompiincludedir)
 nobase_dist_ompi_HEADERS = $(headers)
 nobase_nodist_ompi_HEADERS = $(nodist_headers)
 endif
--- a/ompi/mca/allocator/Makefile.am
+++ b/ompi/mca/allocator/Makefile.am
@ -27,7 +27,7 @@ libmca_allocator_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/allocator/basic/Makefile.am
+++ b/ompi/mca/allocator/basic/Makefile.am
@ -33,7 +33,7 @@ component_noinst = libmca_allocator_basic.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_allocator_basic_la_SOURCES = $(sources)
 mca_allocator_basic_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/allocator/bucket/Makefile.am
+++ b/ompi/mca/allocator/bucket/Makefile.am
@ -34,7 +34,7 @@ component_noinst = libmca_allocator_bucket.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_allocator_bucket_la_SOURCES = $(sources)
 mca_allocator_bucket_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/bcol/Makefile.am
+++ b/ompi/mca/bcol/Makefile.am
@ -24,7 +24,7 @@ libmca_bcol_la_SOURCES += $(headers) $(nodist_headers)
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
 nobase_nodist_ompi_HEADERS += $(nodist_headers)
-ompidir = $(includedir)/openmpi/ompi/mca/bcol
+ompidir = $(ompiincludedir)/ompi/mca/bcol
 else
 ompidir = $(includedir)
 endif
--- a/ompi/mca/bcol/basesmuma/Makefile.am
+++ b/ompi/mca/bcol/basesmuma/Makefile.am
@ -46,7 +46,7 @@ endif

 AM_CPPFLAGS = $(btl_portals_CPPFLAGS)

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_bcol_basesmuma_la_SOURCES = $(sources)
 mca_bcol_basesmuma_la_LDFLAGS = -module -avoid-version $(btl_portals_LDFLAGS)
--- a/ompi/mca/bcol/iboffload/Makefile.am
+++ b/ompi/mca/bcol/iboffload/Makefile.am
@ -53,7 +53,7 @@ endif
 # See ompi/mca/btl/sm/Makefile.am for an explanation of
 # libmca_common_sm.la.

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_bcol_iboffload_la_SOURCES = $(sources)
 mca_bcol_iboffload_la_LDFLAGS = -module -avoid-version $(btl_openib_LDFLAGS) $(bcol_iboffload_LDFLAGS)
--- a/ompi/mca/bcol/ptpcoll/Makefile.am
+++ b/ompi/mca/bcol/ptpcoll/Makefile.am
@ -40,7 +40,7 @@ endif
 # See ompi/mca/btl/sm/Makefile.am for an explanation of
 # libmca_common_sm.la.

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_bcol_ptpcoll_la_SOURCES = $(sources)
 mca_bcol_ptpcoll_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/bml/Makefile.am
+++ b/ompi/mca/bml/Makefile.am
@ -27,7 +27,7 @@ libmca_bml_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/bml/r2/Makefile.am
+++ b/ompi/mca/bml/r2/Makefile.am
@ -22,7 +22,7 @@ r2_sources  = \
        bml_r2_ft.c \
        bml_r2_ft.h

-dist_pkgdata_DATA = help-mca-bml-r2.txt
+dist_ompidata_DATA = help-mca-bml-r2.txt

 if MCA_BUILD_ompi_bml_r2_DSO
 component_noinst =
@ -33,7 +33,7 @@ component_install =
 endif


-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_bml_r2_la_SOURCES = $(r2_sources)
 mca_bml_r2_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/btl/Makefile.am
+++ b/ompi/mca/btl/Makefile.am
@ -29,7 +29,7 @@ libmca_btl_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/btl/base/Makefile.am
+++ b/ompi/mca/btl/base/Makefile.am
@ -16,7 +16,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = base/help-mpi-btl-base.txt
+dist_ompidata_DATA = base/help-mpi-btl-base.txt

 headers += \
        base/base.h \
--- a/ompi/mca/btl/openib/Makefile.am
+++ b/ompi/mca/btl/openib/Makefile.am
@ -29,7 +29,7 @@ LEX_OUTPUT_ROOT = lex.btl_openib_ini_yy
 amca_paramdir = $(AMCA_PARAM_SETS_DIR)
 dist_amca_param_DATA = btl-openib-benchmark

-dist_pkgdata_DATA = \
+dist_ompidata_DATA = \
        help-mpi-btl-openib.txt \
        connect/help-mpi-btl-openib-cpc-base.txt \
        mca-btl-openib-device-params.ini
@ -78,7 +78,7 @@ sources += \
    connect/btl_openib_connect_rdmacm.c \
    connect/btl_openib_connect_rdmacm.h

-dist_pkgdata_DATA += connect/help-mpi-btl-openib-cpc-rdmacm.txt
+dist_ompidata_DATA += connect/help-mpi-btl-openib-cpc-rdmacm.txt
 endif

 # If we have udcm support, build that CPC
@ -87,7 +87,7 @@ sources += \
    connect/btl_openib_connect_udcm.c \
    connect/btl_openib_connect_udcm.h

-# dist_pkgdata_DATA += connect/help-mpi-btl-openib-cpc-ud.txt
+# dist_ompidata_DATA += connect/help-mpi-btl-openib-cpc-ud.txt
 endif

 # If we have dynamic SL support, build those files
@ -113,7 +113,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_openib_la_SOURCES = $(component_sources)
 mca_btl_openib_la_LDFLAGS = -module -avoid-version $(btl_openib_LDFLAGS)
--- a/ompi/mca/btl/portals4/Makefile.am
+++ b/ompi/mca/btl/portals4/Makefile.am
@ -43,7 +43,7 @@ local_sources = \
 	btl_portals4_recv.h \
 	btl_portals4_send.c

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_portals4_la_SOURCES = $(local_sources)
 mca_btl_portals4_la_LIBADD = \
--- a/ompi/mca/btl/scif/Makefile.am
+++ b/ompi/mca/btl/scif/Makefile.am
@ -35,7 +35,7 @@ scif_SOURCES = \
        btl_scif_get.c \
        btl_scif.h

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_scif_la_SOURCES = $(scif_SOURCES)
 nodist_mca_btl_scif_la_SOURCES = $(scif_nodist_SOURCES)
--- a/ompi/mca/btl/sctp/Makefile.am
+++ b/ompi/mca/btl/sctp/Makefile.am
@ -55,7 +55,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_sctp_la_SOURCES = $(component_sources)
 mca_btl_sctp_la_LDFLAGS = -module -avoid-version $(btl_sctp_LDFLAGS)
--- a/ompi/mca/btl/self/Makefile.am
+++ b/ompi/mca/btl/self/Makefile.am
@ -36,7 +36,7 @@ component_noinst = libmca_btl_self.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_self_la_SOURCES = $(libmca_btl_self_la_sources)
 mca_btl_self_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/btl/sm/Makefile.am
+++ b/ompi/mca/btl/sm/Makefile.am
@ -17,7 +17,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = help-mpi-btl-sm.txt
+dist_ompidata_DATA = help-mpi-btl-sm.txt

 libmca_btl_sm_la_sources = \
    btl_sm.c \
@ -43,7 +43,7 @@ endif
 # See ompi/mca/common/sm/Makefile.am for an explanation of
 # libmca_common_sm.la.

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
 mca_btl_sm_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/btl/smcuda/Makefile.am
+++ b/ompi/mca/btl/smcuda/Makefile.am
@ -18,7 +18,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = help-mpi-btl-smcuda.txt
+dist_ompidata_DATA = help-mpi-btl-smcuda.txt

 libmca_btl_smcuda_la_sources = \
    btl_smcuda.c \
@ -44,7 +44,7 @@ endif
 # See ompi/mca/common/cuda/Makefile.am for an explanation of
 # libmca_common_sm.la.

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_smcuda_la_SOURCES = $(libmca_btl_smcuda_la_sources)
 mca_btl_smcuda_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/btl/tcp/Makefile.am
+++ b/ompi/mca/btl/tcp/Makefile.am
@ -18,7 +18,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = help-mpi-btl-tcp.txt
+dist_ompidata_DATA = help-mpi-btl-tcp.txt

 sources = \
    btl_tcp.c \
@ -51,7 +51,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_tcp_la_SOURCES = $(component_sources)
 mca_btl_tcp_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/btl/template/Makefile.am
+++ b/ompi/mca/btl/template/Makefile.am
@ -47,7 +47,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_template_la_SOURCES = $(component_sources)
 mca_btl_template_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/btl/ugni/Makefile.am
+++ b/ompi/mca/btl/ugni/Makefile.am
@ -40,7 +40,7 @@ ugni_SOURCES = \
        btl_ugni_smsg.c \
        btl_ugni_prepare.h

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_ugni_la_SOURCES = $(ugni_SOURCES)
 nodist_mca_btl_ugni_la_SOURCES = $(ugni_nodist_SOURCES)
--- a/ompi/mca/btl/usnic/Makefile.am
+++ b/ompi/mca/btl/usnic/Makefile.am
@ -22,7 +22,7 @@
 AM_CPPFLAGS = $(btl_usnic_CPPFLAGS) 
 AM_CFLAGS = $(btl_usnic_CFLAGS)

-dist_pkgdata_DATA = \
+dist_ompidata_DATA = \
    help-mpi-btl-usnic.txt

 sources = \
@ -70,7 +70,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_usnic_la_SOURCES = $(component_sources)
 mca_btl_usnic_la_LDFLAGS = -module -avoid-version $(btl_usnic_LDFLAGS) 
--- a/ompi/mca/btl/vader/Makefile.am
+++ b/ompi/mca/btl/vader/Makefile.am
@ -21,7 +21,7 @@

 AM_CPPFLAGS = $(btl_vader_CPPFLAGS)

-dist_pkgdata_DATA = help-mpi-btl-vader.txt
+dist_ompidata_DATA = help-mpi-btl-vader.txt

 libmca_btl_vader_la_sources = \
    btl_vader_module.c \
@ -54,7 +54,7 @@ endif
 # See ompi/mca/common/vader/Makefile.am for an explanation of
 # libmca_common_vader.la.

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_vader_la_SOURCES = $(libmca_btl_vader_la_sources)
 mca_btl_vader_la_LDFLAGS = -module -avoid-version $(btl_vader_LDFLAGS)
--- a/ompi/mca/coll/Makefile.am
+++ b/ompi/mca/coll/Makefile.am
@ -29,7 +29,7 @@ libmca_coll_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/coll/base/Makefile.am
+++ b/ompi/mca/coll/base/Makefile.am
@ -16,7 +16,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = base/help-mca-coll-base.txt
+dist_ompidata_DATA = base/help-mca-coll-base.txt

 headers += \
        base/base.h \
--- a/ompi/mca/coll/basic/Makefile.am
+++ b/ompi/mca/coll/basic/Makefile.am
@ -59,7 +59,7 @@ component_noinst = libmca_coll_basic.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_basic_la_SOURCES = $(sources)
 mca_coll_basic_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/coll/demo/Makefile.am
+++ b/ompi/mca/coll/demo/Makefile.am
@ -52,7 +52,7 @@ component_noinst = libmca_coll_demo.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_demo_la_SOURCES = $(sources)
 mca_coll_demo_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/coll/fca/Makefile.am
+++ b/ompi/mca/coll/fca/Makefile.am
@ -12,7 +12,7 @@

 AM_CPPFLAGS = $(coll_fca_CPPFLAGS) -DCOLL_FCA_HOME=\"$(coll_fca_HOME)\" $(coll_fca_extra_CPPFLAGS)

-#dist_pkgdata_DATA = help-coll-fca.txt
+#dist_ompidata_DATA = help-coll-fca.txt
 coll_fca_sources = \
        coll_fca.h \
        coll_fca_debug.h \
@ -34,7 +34,7 @@ component_noinst = libmca_coll_fca.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_fca_la_SOURCES = $(coll_fca_sources)
 mca_coll_fca_la_LIBADD = $(coll_fca_LIBS)
--- a/ompi/mca/coll/hcoll/Makefile.am
+++ b/ompi/mca/coll/hcoll/Makefile.am
@ -33,7 +33,7 @@ component_noinst = libmca_coll_hcoll.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES  = $(component_install)
 mca_coll_hcoll_la_SOURCES = $(coll_hcoll_sources)
 mca_coll_hcoll_la_LIBADD  = $(coll_hcoll_LIBS)
--- a/ompi/mca/coll/hierarch/Makefile.am
+++ b/ompi/mca/coll/hierarch/Makefile.am
@ -29,7 +29,7 @@ component_noinst = libmca_coll_hierarch.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_hierarch_la_SOURCES = $(sources)
 mca_coll_hierarch_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/coll/inter/Makefile.am
+++ b/ompi/mca/coll/inter/Makefile.am
@ -28,7 +28,7 @@ component_noinst = libmca_coll_inter.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_inter_la_SOURCES = $(sources)
 mca_coll_inter_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/coll/libnbc/Makefile.am
+++ b/ompi/mca/coll/libnbc/Makefile.am
@ -66,7 +66,7 @@ component_noinst = libmca_coll_libnbc.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_libnbc_la_SOURCES = $(sources)
 mca_coll_libnbc_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/coll/ml/Makefile.am
+++ b/ompi/mca/coll/ml/Makefile.am
@ -10,7 +10,7 @@
 AM_LFLAGS = -Pcoll_ml_config_yy
 LEX_OUTPUT_ROOT = lex.coll_ml_config_yy

-dist_pkgdata_DATA = \
+dist_ompidata_DATA = \
        mca-coll-ml.config

 not_used_yet = 
@ -64,7 +64,7 @@ endif
 # See ompi/mca/btl/ml/Makefile.am for an explanation of
 # libmca_common_ml.la.

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_ml_la_SOURCES = $(sources)
 mca_coll_ml_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/coll/portals4/Makefile.am
+++ b/ompi/mca/coll/portals4/Makefile.am
@ -23,7 +23,7 @@ component_install =
 endif

 AM_CPPFLAGS = $(coll_portals4_CPPFLAGS)
-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_portals4_la_SOURCES = $(local_sources)
 mca_coll_portals4_la_LIBADD = $(coll_portals4_LIBS)
--- a/ompi/mca/coll/self/Makefile.am
+++ b/ompi/mca/coll/self/Makefile.am
@ -50,7 +50,7 @@ component_noinst = libmca_coll_self.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_self_la_SOURCES = $(sources)
 mca_coll_self_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/coll/sm/Makefile.am
+++ b/ompi/mca/coll/sm/Makefile.am
@ -17,7 +17,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = help-mpi-coll-sm.txt
+dist_ompidata_DATA = help-mpi-coll-sm.txt

 not_used_yet = \
        coll_sm_allgather.c \
@ -57,7 +57,7 @@ endif
 # See ompi/mca/btl/sm/Makefile.am for an explanation of
 # libmca_common_sm.la.

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_sm_la_SOURCES = $(sources)
 mca_coll_sm_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/coll/tuned/Makefile.am
+++ b/ompi/mca/coll/tuned/Makefile.am
@ -55,7 +55,7 @@ component_noinst = libmca_coll_tuned.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_tuned_la_SOURCES = $(sources)
 mca_coll_tuned_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/common/cuda/Makefile.am
+++ b/ompi/mca/common/cuda/Makefile.am
@ -51,7 +51,7 @@ headers = \
 sources = \
        common_cuda.c

-dist_pkgdata_DATA = help-mpi-common-cuda.txt
+dist_ompidata_DATA = help-mpi-common-cuda.txt

 # As per above, we'll either have an installable or noinst result.
 # The installable one should follow the same MCA prefix naming rules
@ -90,7 +90,7 @@ libmca_common_cuda_noinst_la_LIBADD = $(common_cuda_LIBS)
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/common/ofacm/Makefile.am
+++ b/ompi/mca/common/ofacm/Makefile.am
@ -11,7 +11,7 @@

 AM_CPPFLAGS = $(common_ofacm_CPPFLAGS)

-dist_pkgdata_DATA = \
+dist_ompidata_DATA = \
        help-mpi-common-ofacm-base.txt \
        help-mpi-common-ofacm-oob.txt
 headers = \
@ -57,7 +57,7 @@ libmca_common_ofacm_noinst_la_SOURCES = $(libmca_common_ofacm_la_SOURCES)
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/ompi/mca/common/ofacm
+ompidir = $(ompiincludedir)/ompi/mca/common/ofacm
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
--- a/ompi/mca/common/sm/Makefile.am
+++ b/ompi/mca/common/sm/Makefile.am
@ -55,7 +55,7 @@ sources = \

 # Help file

-dist_pkgdata_DATA = help-mpi-common-sm.txt
+dist_ompidata_DATA = help-mpi-common-sm.txt

 # As per above, we'll either have an installable or noinst result.
 # The installable one should follow the same MCA prefix naming rules
@ -90,7 +90,7 @@ libmca_common_sm_noinst_la_SOURCES = $(libmca_common_sm_la_SOURCES)
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/common/ugni/Makefile.am
+++ b/ompi/mca/common/ugni/Makefile.am
@ -30,7 +30,7 @@ headers = common_ugni.h \
 ugni_SOURCES = common_ugni.c \
               common_ugni_ep.c

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 libmca_common_ugni_la_SOURCES = $(headers) $(ugni_SOURCES)
 nodist_libmca_common_ugni_la_SOURCES = $(ugni_nodist_SOURCES)
 libmca_common_ugni_la_LIBADD = $(common_ugni_LIBS) 
--- a/ompi/mca/common/verbs/Makefile.am
+++ b/ompi/mca/common/verbs/Makefile.am
@ -23,7 +23,7 @@ sources = \
 	common_verbs_port.c \
 	common_verbs_qp_type.c

-dist_pkgdata_DATA = \
+dist_ompidata_DATA = \
        help-ompi-common-verbs.txt

 # To simplify components that link to this library, we will *always*
@ -58,7 +58,7 @@ libmca_common_verbs_noinst_la_SOURCES = $(libmca_common_verbs_la_SOURCES)
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/ompi/mca/common/verbs
+ompidir = $(ompiincludedir)/ompi/mca/common/verbs
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
--- a/ompi/mca/crcp/Makefile.am
+++ b/ompi/mca/crcp/Makefile.am
@ -39,7 +39,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/crcp/base/Makefile.am
+++ b/ompi/mca/crcp/base/Makefile.am
@ -16,7 +16,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = base/help-ompi-crcp-base.txt
+dist_ompidata_DATA = base/help-ompi-crcp-base.txt

 headers += \
        base/base.h
--- a/ompi/mca/crcp/bkmrk/Makefile.am
+++ b/ompi/mca/crcp/bkmrk/Makefile.am
@ -15,7 +15,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = help-ompi-crcp-bkmrk.txt
+dist_ompidata_DATA = help-ompi-crcp-bkmrk.txt

 sources = \
        crcp_bkmrk.h \
@ -36,7 +36,7 @@ component_noinst = libmca_crcp_bkmrk.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_crcp_bkmrk_la_SOURCES = $(sources)
 mca_crcp_bkmrk_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/dpm/Makefile.am
+++ b/ompi/mca/dpm/Makefile.am
@ -27,7 +27,7 @@ libmca_dpm_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/dpm/base/Makefile.am
+++ b/ompi/mca/dpm/base/Makefile.am
@ -16,7 +16,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = base/help-ompi-dpm-base.txt
+dist_ompidata_DATA = base/help-ompi-dpm-base.txt

 headers += \
        base/base.h
--- a/ompi/mca/dpm/orte/Makefile.am
+++ b/ompi/mca/dpm/orte/Makefile.am
@ -12,7 +12,7 @@
 #


-dist_pkgdata_DATA = help-ompi-dpm-orte.txt
+dist_ompidata_DATA = help-ompi-dpm-orte.txt

 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
@ -31,7 +31,7 @@ local_sources = \
 	dpm_orte.h \
 	dpm_orte_component.c

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_dpm_orte_la_SOURCES = $(local_sources)
 mca_dpm_orte_la_LDFLAGS = -module -avoid-version $(dpm_orte_LDFLAGS)
--- a/ompi/mca/fbtl/Makefile.am
+++ b/ompi/mca/fbtl/Makefile.am
@ -30,7 +30,7 @@ libmca_fbtl_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/fbtl/posix/Makefile.am
+++ b/ompi/mca/fbtl/posix/Makefile.am
@ -29,7 +29,7 @@ component_noinst = libmca_fbtl_posix.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fbtl_posix_la_SOURCES = $(sources)
 mca_fbtl_posix_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/fbtl/pvfs2/Makefile.am
+++ b/ompi/mca/fbtl/pvfs2/Makefile.am
@ -42,7 +42,7 @@ fbtl_pvfs2_sources = \

 AM_CPPFLAGS = $(fbtl_pvfs2_CPPFLAGS)

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fbtl_pvfs2_la_SOURCES = $(fbtl_pvfs2_sources)
 mca_fbtl_pvfs2_la_LIBADD = $(fbtl_pvfs2_LIBS)
--- a/ompi/mca/fcoll/Makefile.am
+++ b/ompi/mca/fcoll/Makefile.am
@ -30,7 +30,7 @@ libmca_fcoll_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/fcoll/dynamic/Makefile.am
+++ b/ompi/mca/fcoll/dynamic/Makefile.am
@ -41,7 +41,7 @@ component_noinst = libmca_fcoll_dynamic.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fcoll_dynamic_la_SOURCES = $(sources)
 mca_fcoll_dynamic_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/fcoll/individual/Makefile.am
+++ b/ompi/mca/fcoll/individual/Makefile.am
@ -41,7 +41,7 @@ component_noinst = libmca_fcoll_individual.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fcoll_individual_la_SOURCES = $(sources)
 mca_fcoll_individual_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/fcoll/static/Makefile.am
+++ b/ompi/mca/fcoll/static/Makefile.am
@ -41,7 +41,7 @@ component_noinst = libmca_fcoll_static.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fcoll_static_la_SOURCES = $(sources)
 mca_fcoll_static_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/fcoll/two_phase/Makefile.am
+++ b/ompi/mca/fcoll/two_phase/Makefile.am
@ -42,7 +42,7 @@ component_noinst = libmca_fcoll_two_phase.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fcoll_two_phase_la_SOURCES = $(sources)
 mca_fcoll_two_phase_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/fs/Makefile.am
+++ b/ompi/mca/fs/Makefile.am
@ -30,7 +30,7 @@ libmca_fs_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/fs/lustre/Makefile.am
+++ b/ompi/mca/fs/lustre/Makefile.am
@ -45,7 +45,7 @@ fs_lustre_sources = \

 AM_CPPFLAGS = $(fs_lustre_CPPFLAGS)

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fs_lustre_la_SOURCES = $(fs_lustre_sources)
 mca_fs_lustre_la_LIBADD = $(fs_lustre_LIBS)
--- a/ompi/mca/fs/pvfs2/Makefile.am
+++ b/ompi/mca/fs/pvfs2/Makefile.am
@ -45,7 +45,7 @@ fs_pvfs2_sources = \

 AM_CPPFLAGS = $(fs_pvfs2_CPPFLAGS)

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fs_pvfs2_la_SOURCES = $(fs_pvfs2_sources)
 mca_fs_pvfs2_la_LIBADD = $(fs_pvfs2_LIBS)
--- a/ompi/mca/fs/ufs/Makefile.am
+++ b/ompi/mca/fs/ufs/Makefile.am
@ -29,7 +29,7 @@ component_noinst = libmca_fs_ufs.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fs_ufs_la_SOURCES = $(sources)
 mca_fs_ufs_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/io/Makefile.am
+++ b/ompi/mca/io/Makefile.am
@ -29,7 +29,7 @@ libmca_io_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/io/ompio/Makefile.am
+++ b/ompi/mca/io/ompio/Makefile.am
@ -29,7 +29,7 @@ component_noinst = libmca_io_ompio.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_io_ompio_la_SOURCES = $(sources)
 mca_io_ompio_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/io/romio/Makefile.am
+++ b/ompi/mca/io/romio/Makefile.am
@ -44,7 +44,7 @@ endif

 libs = romio/libromio_dist.la

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_io_romio_la_SOURCES = $(component_sources)
 mca_io_romio_la_LIBADD = $(libs)
--- a/ompi/mca/mpool/Makefile.am
+++ b/ompi/mca/mpool/Makefile.am
@ -27,11 +27,11 @@ libmca_mpool_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

-dist_pkgdata_DATA =
+dist_ompidata_DATA =
 include base/Makefile.am

 distclean-local:
--- a/ompi/mca/mpool/base/Makefile.am
+++ b/ompi/mca/mpool/base/Makefile.am
@ -29,5 +29,5 @@ libmca_mpool_la_SOURCES += \
        base/mpool_base_mem_cb.c \
 	base/mpool_base_tree.c

-dist_pkgdata_DATA += \
+dist_ompidata_DATA += \
        base/help-mpool-base.txt
--- a/ompi/mca/mpool/gpusm/Makefile.am
+++ b/ompi/mca/mpool/gpusm/Makefile.am
@ -25,7 +25,7 @@ sources = \
    mpool_gpusm_component.c

 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 ompi_HEADERS = mpool_gpusm.h
 endif

@ -41,7 +41,7 @@ component_noinst = libmca_mpool_gpusm.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_gpusm_la_SOURCES = $(sources)
 mca_mpool_gpusm_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/mpool/grdma/Makefile.am
+++ b/ompi/mca/mpool/grdma/Makefile.am
@ -26,7 +26,7 @@ sources = \
 	mpool_grdma_component.c

 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 ompi_HEADERS = mpool_grdma.h
 endif

@ -42,7 +42,7 @@ component_noinst = libmca_mpool_grdma.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_grdma_la_SOURCES = $(sources)
 mca_mpool_grdma_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/mpool/rgpusm/Makefile.am
+++ b/ompi/mca/mpool/rgpusm/Makefile.am
@ -25,7 +25,7 @@ sources = \
    mpool_rgpusm_component.c

 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 ompi_HEADERS = mpool_rgpusm.h
 endif

@ -41,7 +41,7 @@ component_noinst = libmca_mpool_rgpusm.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_rgpusm_la_SOURCES = $(sources)
 mca_mpool_rgpusm_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/mpool/sm/Makefile.am
+++ b/ompi/mca/mpool/sm/Makefile.am
@ -38,7 +38,7 @@ endif
 # See ompi/mca/common/sm/Makefile.am for an explanation of
 # libmca_common_sm.la.

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_sm_la_SOURCES = $(sources)
 mca_mpool_sm_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/mpool/udreg/Makefile.am
+++ b/ompi/mca/mpool/udreg/Makefile.am
@ -24,7 +24,7 @@ AM_CPPFLAGS = $(mpool_udreg_CPPFLAGS)
 sources = mpool_udreg_module.c mpool_udreg_component.c

 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 ompi_HEADERS = mpool_udreg.h
 endif

@ -40,7 +40,7 @@ component_noinst = libmca_mpool_udreg.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_udreg_la_SOURCES = $(sources)
 mca_mpool_udreg_la_LDFLAGS = -module -avoid-version $(mpool_udreg_LDFLAGS)
--- a/ompi/mca/mtl/Makefile.am
+++ b/ompi/mca/mtl/Makefile.am
@ -27,7 +27,7 @@ libmca_mtl_la_SOURCES += $(headers) $(nodist_headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 nobase_nodist_ompi_HEADERS = $(nodist_headers)
 endif
--- a/ompi/mca/mtl/mxm/Makefile.am
+++ b/ompi/mca/mtl/mxm/Makefile.am
@ -9,7 +9,7 @@

 AM_CPPFLAGS = $(mtl_mxm_CPPFLAGS)

-dist_pkgdata_DATA = help-mtl-mxm.txt
+dist_ompidata_DATA = help-mtl-mxm.txt

 mtl_mxm_sources = \
 	       mtl_mxm.c \
@ -37,7 +37,7 @@ component_noinst = libmca_mtl_mxm.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_mxm_la_SOURCES = $(mtl_mxm_sources)
 mca_mtl_mxm_la_LIBADD = $(mtl_mxm_LIBS)
--- a/ompi/mca/mtl/portals4/Makefile.am
+++ b/ompi/mca/mtl/portals4/Makefile.am
@ -52,7 +52,7 @@ local_sources += \
 	mtl_portals4_flowctl.c
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_portals4_la_SOURCES = $(local_sources)
 mca_mtl_portals4_la_LIBADD = $(mtl_portals4_LIBS)
--- a/ompi/mca/mtl/psm/Makefile.am
+++ b/ompi/mca/mtl/psm/Makefile.am
@ -21,7 +21,7 @@ EXTRA_DIST = post_configure.sh

 AM_CPPFLAGS = $(mtl_psm_CPPFLAGS)

-dist_pkgdata_DATA = help-mtl-psm.txt
+dist_ompidata_DATA = help-mtl-psm.txt

 mtl_psm_sources = \
 	       mtl_psm.c \
@ -48,7 +48,7 @@ component_noinst = libmca_mtl_psm.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_psm_la_SOURCES = $(mtl_psm_sources)
 mca_mtl_psm_la_LIBADD = $(mtl_psm_LIBS)
--- a/ompi/mca/op/Makefile.am
+++ b/ompi/mca/op/Makefile.am
@ -27,7 +27,7 @@ libmca_op_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/op/base/Makefile.include
+++ b/ompi/mca/op/base/Makefile.include
@ -18,7 +18,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = base/help-mca-op-base.txt
+dist_ompidata_DATA = base/help-mca-op-base.txt

 headers += \
        base/base.h \
--- a/ompi/mca/op/example/Makefile.am
+++ b/ompi/mca/op/example/Makefile.am
@ -63,10 +63,10 @@ endif

 # Specific information for DSO builds.
 #
-# The DSO should install itself in $(pkglibdir) (by default,
+# The DSO should install itself in $(ompilibdir) (by default,
 # $prefix/lib/openmpi).

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_op_example_la_SOURCES = $(component_sources)
 mca_op_example_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/op/x86/Makefile.am
+++ b/ompi/mca/op/x86/Makefile.am
@ -36,10 +36,10 @@ endif

 # Specific information for DSO builds.
 #
-# The DSO should install itself in $(pkglibdir) (by default,
+# The DSO should install itself in $(ompilibdir) (by default,
 # $prefix/lib/openmpi).

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_op_x86_la_SOURCES = $(component_sources)
 mca_op_x86_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/osc/Makefile.am
+++ b/ompi/mca/osc/Makefile.am
@ -27,7 +27,7 @@ libmca_osc_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/osc/pt2pt/Makefile.am
+++ b/ompi/mca/osc/pt2pt/Makefile.am
@ -45,7 +45,7 @@ component_noinst = libmca_osc_pt2pt.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_pt2pt_la_SOURCES = $(pt2pt_sources)
 mca_osc_pt2pt_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/osc/rdma/Makefile.am
+++ b/ompi/mca/osc/rdma/Makefile.am
@ -44,7 +44,7 @@ component_noinst = libmca_osc_rdma.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_rdma_la_SOURCES = $(pt2pt_sources)
 mca_osc_rdma_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/pml/Makefile.am
+++ b/ompi/mca/pml/Makefile.am
@ -27,7 +27,7 @@ libmca_pml_la_SOURCES += $(headers) $(nodist_headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 nobase_nodist_ompi_HEADERS = $(nodist_headers)
 endif
--- a/ompi/mca/pml/bfo/Makefile.am
+++ b/ompi/mca/pml/bfo/Makefile.am
@ -21,7 +21,7 @@

 AM_CPPFLAGS = -DPML_BFO=1

-dist_pkgdata_DATA = \
+dist_ompidata_DATA = \
 	help-mpi-pml-bfo.txt

 EXTRA_DIST = post_configure.sh
@ -66,7 +66,7 @@ component_noinst = libmca_pml_bfo.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_bfo_la_SOURCES = $(bfo_sources)
 mca_pml_bfo_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/pml/cm/Makefile.am
+++ b/ompi/mca/pml/cm/Makefile.am
@ -42,7 +42,7 @@ local_sources = \
 	pml_cm_sendreq.c \
 	pml_cm_start.c

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_cm_la_SOURCES = $(local_sources)
 mca_pml_cm_la_LIBADD = $(pml_cm_LIBS)
--- a/ompi/mca/pml/crcpw/Makefile.am
+++ b/ompi/mca/pml/crcpw/Makefile.am
@ -32,7 +32,7 @@ component_install =
 endif


-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_crcpw_la_SOURCES = $(crcpw_sources)
 mca_pml_crcpw_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/pml/example/Makefile.am
+++ b/ompi/mca/pml/example/Makefile.am
@ -48,7 +48,7 @@ local_sources = \
 	pml_example_sendreq.h \
 	pml_example_start.c

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_example_la_SOURCES = $(local_sources)
 mca_pml_example_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/pml/ob1/Makefile.am
+++ b/ompi/mca/pml/ob1/Makefile.am
@ -19,7 +19,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = \
+dist_ompidata_DATA = \
 	help-mpi-pml-ob1.txt

 EXTRA_DIST = post_configure.sh
@ -62,7 +62,7 @@ component_noinst = libmca_pml_ob1.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_ob1_la_SOURCES = $(ob1_sources)
 mca_pml_ob1_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/pml/v/Makefile.am
+++ b/ompi/mca/pml/v/Makefile.am
@ -27,7 +27,7 @@ component_noinst = libmca_pml_v.la
 component_install =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_v_la_SOURCES = $(local_sources)
 mca_pml_v_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/pubsub/Makefile.am
+++ b/ompi/mca/pubsub/Makefile.am
@ -27,7 +27,7 @@ libmca_pubsub_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/pubsub/orte/Makefile.am
+++ b/ompi/mca/pubsub/orte/Makefile.am
@ -11,7 +11,7 @@
 # $HEADER$
 #

-dist_pkgdata_DATA = help-ompi-pubsub-orte.txt
+dist_ompidata_DATA = help-ompi-pubsub-orte.txt

 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
@ -30,7 +30,7 @@ local_sources = \
 	pubsub_orte.h \
 	pubsub_orte_component.c

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pubsub_orte_la_SOURCES = $(local_sources)
 mca_pubsub_orte_la_LDFLAGS = -module -avoid-version $(pubsub_orte_LDFLAGS)
--- a/ompi/mca/pubsub/pmi/Makefile.am
+++ b/ompi/mca/pubsub/pmi/Makefile.am
@ -26,7 +26,7 @@ local_sources = \
 	pubsub_pmi.h \
 	pubsub_pmi_component.c

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pubsub_pmi_la_SOURCES = $(local_sources)
 mca_pubsub_pmi_la_LDFLAGS = -module -avoid-version $(pubsub_pmi_LDFLAGS)
--- a/ompi/mca/rcache/Makefile.am
+++ b/ompi/mca/rcache/Makefile.am
@ -27,7 +27,7 @@ libmca_rcache_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/$(subdir)
+ompidir = $(ompiincludedir)/$(subdir)
 nobase_ompi_HEADERS = $(headers)
 endif

--- a/ompi/mca/rcache/vma/Makefile.am
+++ b/ompi/mca/rcache/vma/Makefile.am
@ -40,7 +40,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(pkglibdir)
+mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_rcache_vma_la_SOURCES = $(component_sources)
 mca_rcache_vma_la_LDFLAGS = -module -avoid-version $(rcache_vma_LDFLAGS)
--- a/Show More
+++ b/Show More