Just like r14289 on the ORTE trunk:

Per discussions with Brian and Ralph, make a slight correction in where components are installed. Use $pkglibdir, not $libdir/openmpi, so that when compiled in the orte trunk, components are installed to the right directory (because the component search patch is checking $pkglibdir). This commit was SVN r14345. The following SVN revisions from the original message are invalid or inconsistent and therefore were not cross-referenced: r14289
2007-04-12 11:19:42 +00:00 · 2007-04-12 11:19:42 +00:00 · 51f286d737
--- a/ompi/mca/allocator/basic/Makefile.am
+++ b/ompi/mca/allocator/basic/Makefile.am
@ -36,7 +36,7 @@ component_noinst = libmca_allocator_basic.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 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
@ -37,7 +37,7 @@ component_noinst = libmca_allocator_bucket.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_allocator_bucket_la_SOURCES = $(sources)
 mca_allocator_bucket_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/bml/r2/Makefile.am
+++ b/ompi/mca/bml/r2/Makefile.am
@ -34,7 +34,7 @@ component_install =
 endif


-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_bml_r2_la_SOURCES = $(r2_sources)
 mca_bml_r2_la_LIBADD = \
--- a/ompi/mca/btl/gm/Makefile.am
+++ b/ompi/mca/btl/gm/Makefile.am
@ -45,7 +45,7 @@ component_noinst = libmca_btl_gm.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_gm_la_SOURCES = $(gm_sources)
 mca_btl_gm_la_LIBADD = \
--- a/ompi/mca/btl/mvapi/Makefile.am
+++ b/ompi/mca/btl/mvapi/Makefile.am
@ -53,7 +53,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_mvapi_la_SOURCES = $(component_sources)
 mca_btl_mvapi_la_LDFLAGS = -module -avoid-version $(btl_mvapi_LDFLAGS)
--- a/ompi/mca/btl/mx/Makefile.am
+++ b/ompi/mca/btl/mx/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_btl_mx.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_mx_la_SOURCES = $(btl_mx_sources)
 mca_btl_mx_la_LIBADD = \
--- a/ompi/mca/btl/openib/Makefile.am
+++ b/ompi/mca/btl/openib/Makefile.am
@ -64,7 +64,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 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/portals/Makefile.am
+++ b/ompi/mca/btl/portals/Makefile.am
@ -47,7 +47,7 @@ portals_SOURCES = \

 AM_CPPFLAGS = $(btl_portals_CPPFLAGS)

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_portals_la_SOURCES = $(portals_SOURCES)
 nodist_mca_btl_portals_la_SOURCES = $(portals_nodist_SOURCES)
--- a/ompi/mca/btl/self/Makefile.am
+++ b/ompi/mca/btl/self/Makefile.am
@ -39,7 +39,7 @@ component_noinst = libmca_btl_self.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 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
@ -44,7 +44,7 @@ endif
 # See ompi/mca/common/sm/Makefile.am for an explanation of
 # libmca_common_sm.la.

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 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/tcp/Makefile.am
+++ b/ompi/mca/btl/tcp/Makefile.am
@ -49,7 +49,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 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
@ -50,7 +50,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_template_la_SOURCES = $(component_sources)
 mca_btl_template_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/btl/udapl/Makefile.am
+++ b/ompi/mca/btl/udapl/Makefile.am
@ -52,7 +52,7 @@ component_noinst = libmca_btl_udapl.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_udapl_la_SOURCES = $(udapl_sources)
 mca_btl_udapl_la_LIBADD = \
--- a/ompi/mca/coll/basic/Makefile.am
+++ b/ompi/mca/coll/basic/Makefile.am
@ -49,7 +49,7 @@ component_noinst = libmca_coll_basic.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 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
@ -59,7 +59,7 @@ component_noinst = libmca_coll_demo.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_demo_la_SOURCES = $(sources)
 mca_coll_demo_la_LIBADD = $(LIBMPI_LA)
--- a/ompi/mca/coll/hierarch/Makefile.am
+++ b/ompi/mca/coll/hierarch/Makefile.am
@ -28,7 +28,7 @@ component_noinst = libmca_coll_hierarch.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 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 = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 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
@ -54,7 +54,7 @@ component_noinst = libmca_coll_libnbc.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_libnbc_la_SOURCES = $(sources)
 mca_coll_libnbc_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/coll/self/Makefile.am
+++ b/ompi/mca/coll/self/Makefile.am
@ -49,7 +49,7 @@ component_noinst = libmca_coll_self.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 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
@ -54,7 +54,7 @@ endif
 # See ompi/mca/ptl/sm/Makefile.am for an explanation of
 # libmca_common_sm.la.

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 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
@ -54,7 +54,7 @@ component_noinst = libmca_coll_tuned.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_tuned_la_SOURCES = $(sources)
 mca_coll_tuned_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/crcp/coord/Makefile.am
+++ b/ompi/mca/crcp/coord/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_crcp_coord.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_crcp_coord_la_SOURCES = $(sources)
 mca_crcp_coord_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/io/romio/Makefile.am
+++ b/ompi/mca/io/romio/Makefile.am
@ -47,7 +47,7 @@ endif

 libs = romio/libromio_dist.la

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_io_romio_la_SOURCES = $(component_sources)
 mca_io_romio_la_LIBADD = \
--- a/ompi/mca/mpool/gm/Makefile.am
+++ b/ompi/mca/mpool/gm/Makefile.am
@ -41,7 +41,7 @@ endif

 # See src/mca/ptl/gm/Makefile.am for an explanation of
 # libmca_common_gm.la.
-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_gm_la_SOURCES = $(sources)
 mca_mpool_gm_la_LIBADD = \
--- a/ompi/mca/mpool/mvapi/Makefile.am
+++ b/ompi/mca/mpool/mvapi/Makefile.am
@ -43,7 +43,7 @@ endif
 # See src/mca/ptl/mvapi/Makefile.am for an explanation of
 # libmca_common_mvapi.la.

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_mvapi_la_SOURCES = $(sources)
 mca_mpool_mvapi_la_LDFLAGS = -module -avoid-version $(mpool_mvapi_LDFLAGS)
--- a/ompi/mca/mpool/openib/Makefile.am
+++ b/ompi/mca/mpool/openib/Makefile.am
@ -42,7 +42,7 @@ endif
 # See src/mca/ptl/openib/Makefile.am for an explanation of
 # libmca_common_openib.la.

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_openib_la_SOURCES = $(sources)
 mca_mpool_openib_la_LDFLAGS = -module -avoid-version $(mpool_openib_LDFLAGS)
--- a/ompi/mca/mpool/rdma/Makefile.am
+++ b/ompi/mca/mpool/rdma/Makefile.am
@ -39,7 +39,7 @@ component_noinst = libmca_mpool_rdma.la
 component_install =
 endif

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

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_sm_la_SOURCES = $(sources)
 mca_mpool_sm_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/mpool/udapl/Makefile.am
+++ b/ompi/mca/mpool/udapl/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_mpool_udapl.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_udapl_la_SOURCES = $(sources)
 mca_mpool_udapl_la_LIBADD = \
--- a/ompi/mca/mtl/mx/Makefile.am
+++ b/ompi/mca/mtl/mx/Makefile.am
@ -45,7 +45,7 @@ component_noinst = libmca_mtl_mx.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_mx_la_SOURCES = $(mtl_mx_sources)
 mca_mtl_mx_la_LIBADD = \
--- a/ompi/mca/mtl/portals/Makefile.am
+++ b/ompi/mca/mtl/portals/Makefile.am
@ -42,7 +42,7 @@ local_sources = \
 	mtl_portals_send.c \
 	mtl_portals_probe.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_portals_la_SOURCES = $(local_sources)
 mca_mtl_portals_la_LIBADD = \
--- a/ompi/mca/mtl/psm/Makefile.am
+++ b/ompi/mca/mtl/psm/Makefile.am
@ -45,7 +45,7 @@ component_noinst = libmca_mtl_psm.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_psm_la_SOURCES = $(mtl_psm_sources)
 mca_mtl_psm_la_LIBADD = \
--- a/ompi/mca/osc/pt2pt/Makefile.am
+++ b/ompi/mca/osc/pt2pt/Makefile.am
@ -50,7 +50,7 @@ component_noinst = libmca_osc_pt2pt.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_pt2pt_la_SOURCES = $(pt2pt_sources)
 mca_osc_pt2pt_la_LIBADD = 
--- a/ompi/mca/osc/rdma/Makefile.am
+++ b/ompi/mca/osc/rdma/Makefile.am
@ -48,7 +48,7 @@ component_noinst = libmca_osc_rdma.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_rdma_la_SOURCES = $(pt2pt_sources)
 mca_osc_rdma_la_LIBADD = 
--- a/ompi/mca/pml/cm/Makefile.am
+++ b/ompi/mca/pml/cm/Makefile.am
@ -40,7 +40,7 @@ local_sources = \
 	pml_cm_progress.c \
 	pml_cm_start.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_cm_la_SOURCES = $(local_sources)
 mca_pml_cm_la_LIBADD = \
--- a/ompi/mca/pml/crcpw/Makefile.am
+++ b/ompi/mca/pml/crcpw/Makefile.am
@ -31,7 +31,7 @@ component_install =
 endif


-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_crcpw_la_SOURCES = $(crcpw_sources)
 mca_pml_crcpw_la_LIBADD = \
--- a/ompi/mca/pml/dr/Makefile.am
+++ b/ompi/mca/pml/dr/Makefile.am
@ -50,7 +50,7 @@ component_install =
 endif


-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_dr_la_SOURCES = $(dr_sources)
 mca_pml_dr_la_LIBADD = \
--- a/ompi/mca/pml/example/Makefile.am
+++ b/ompi/mca/pml/example/Makefile.am
@ -51,7 +51,7 @@ local_sources = \
 	pml_example_sendreq.h \
 	pml_example_start.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_example_la_SOURCES = $(local_sources)
 mca_pml_example_la_LIBADD = \
--- a/ompi/mca/pml/ob1/Makefile.am
+++ b/ompi/mca/pml/ob1/Makefile.am
@ -51,7 +51,7 @@ component_noinst = libmca_pml_ob1.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_ob1_la_SOURCES = $(ob1_sources)
 mca_pml_ob1_la_LIBADD = \
--- a/ompi/mca/rcache/rb/Makefile.am
+++ b/ompi/mca/rcache/rb/Makefile.am
@ -45,7 +45,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_rcache_rb_la_SOURCES = $(component_sources)
 mca_rcache_rb_la_LDFLAGS = -module -avoid-version $(rcache_rb_LDFLAGS)
--- a/ompi/mca/rcache/vma/Makefile.am
+++ b/ompi/mca/rcache/vma/Makefile.am
@ -43,7 +43,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_rcache_vma_la_SOURCES = $(component_sources)
 mca_rcache_vma_la_LDFLAGS = -module -avoid-version $(rcache_vma_LDFLAGS)
--- a/ompi/mca/topo/unity/Makefile.am
+++ b/ompi/mca/topo/unity/Makefile.am
@ -43,7 +43,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_topo_unity_la_SOURCES = $(component_sources)
 mca_topo_unity_la_LIBADD = \
--- a/opal/mca/crs/blcr/Makefile.am
+++ b/opal/mca/crs/blcr/Makefile.am
@ -36,7 +36,7 @@ component_noinst  = libmca_crs_blcr.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_crs_blcr_la_SOURCES  = $(sources)
 mca_crs_blcr_la_LDFLAGS  = -module -avoid-version $(crs_blcr_LDFLAGS)
--- a/opal/mca/crs/self/Makefile.am
+++ b/opal/mca/crs/self/Makefile.am
@ -36,7 +36,7 @@ component_noinst = libmca_crs_self.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_crs_self_la_SOURCES = $(sources)
 mca_crs_self_la_LDFLAGS = -module -avoid-version
--- a/opal/mca/maffinity/first_use/Makefile.am
+++ b/opal/mca/maffinity/first_use/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_maffinity_first_use.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_maffinity_first_use_la_SOURCES = $(sources)
 mca_maffinity_first_use_la_LDFLAGS = -module -avoid-version
--- a/opal/mca/maffinity/libnuma/Makefile.am
+++ b/opal/mca/maffinity/libnuma/Makefile.am
@ -35,7 +35,7 @@ component_noinst = libmca_maffinity_libnuma.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_maffinity_libnuma_la_SOURCES = $(sources)
 mca_maffinity_libnuma_la_LDFLAGS = -module -avoid-version $(maffinity_libnuma_LDFLAGS)
--- a/opal/mca/paffinity/linux/Makefile.am
+++ b/opal/mca/paffinity/linux/Makefile.am
@ -33,7 +33,7 @@ component_noinst = libmca_paffinity_linux.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_paffinity_linux_la_SOURCES = $(sources)
 mca_paffinity_linux_la_LDFLAGS = -module -avoid-version
--- a/opal/mca/paffinity/solaris/Makefile.am
+++ b/opal/mca/paffinity/solaris/Makefile.am
@ -33,7 +33,7 @@ component_noinst = libmca_paffinity_solaris.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_paffinity_solaris_la_SOURCES = $(sources)
 mca_paffinity_solaris_la_LDFLAGS = -module -avoid-version
--- a/opal/mca/paffinity/windows/Makefile.am
+++ b/opal/mca/paffinity/windows/Makefile.am
@ -33,7 +33,7 @@ component_noinst = libmca_paffinity_windows.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_paffinity_windows_la_SOURCES = $(sources)
 mca_paffinity_windows_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/errmgr/bproc/Makefile.am
+++ b/orte/mca/errmgr/bproc/Makefile.am
@ -36,7 +36,7 @@ sources = \
    errmgr_bproc.c \
    errmgr_bproc_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_errmgr_bproc_la_SOURCES = $(sources)
 mca_errmgr_bproc_la_LIBADD = \
--- a/orte/mca/errmgr/hnp/Makefile.am
+++ b/orte/mca/errmgr/hnp/Makefile.am
@ -33,7 +33,7 @@ component_noinst = libmca_errmgr_hnp.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_errmgr_hnp_la_SOURCES = $(sources)
 mca_errmgr_hnp_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/errmgr/orted/Makefile.am
+++ b/orte/mca/errmgr/orted/Makefile.am
@ -33,7 +33,7 @@ component_noinst = libmca_errmgr_orted.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_errmgr_orted_la_SOURCES = $(sources)
 mca_errmgr_orted_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/errmgr/proxy/Makefile.am
+++ b/orte/mca/errmgr/proxy/Makefile.am
@ -33,7 +33,7 @@ component_noinst = libmca_errmgr_proxy.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_errmgr_proxy_la_SOURCES = $(sources)
 mca_errmgr_proxy_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/filem/rsh/Makefile.am
+++ b/orte/mca/filem/rsh/Makefile.am
@ -33,7 +33,7 @@ component_noinst = libmca_filem_rsh.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_filem_rsh_la_SOURCES = $(sources)
 mca_filem_rsh_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/gpr/null/Makefile.am
+++ b/orte/mca/gpr/null/Makefile.am
@ -33,7 +33,7 @@ component_noinst = libmca_gpr_null.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_gpr_null_la_SOURCES = $(sources)
 mca_gpr_null_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/gpr/proxy/Makefile.am
+++ b/orte/mca/gpr/proxy/Makefile.am
@ -43,7 +43,7 @@ component_noinst = libmca_gpr_proxy.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_gpr_proxy_la_SOURCES = $(sources)
 mca_gpr_proxy_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/gpr/replica/Makefile.am
+++ b/orte/mca/gpr/replica/Makefile.am
@ -30,7 +30,7 @@ component_noinst = libmca_gpr_replica.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_gpr_replica_la_SOURCES = gpr_replica.h \
                             gpr_replica_class_instances.h \
--- a/orte/mca/iof/null/Makefile.am
+++ b/orte/mca/iof/null/Makefile.am
@ -37,7 +37,7 @@ null_SOURCES = \
    iof_null_module.c \
    iof_null_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_iof_null_la_SOURCES = $(null_SOURCES)
 mca_iof_null_la_LIBADD = \
--- a/orte/mca/iof/proxy/Makefile.am
+++ b/orte/mca/iof/proxy/Makefile.am
@ -39,7 +39,7 @@ proxy_SOURCES = \
    iof_proxy_svc.c \
    iof_proxy_svc.h

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_iof_proxy_la_SOURCES = $(proxy_SOURCES)
 mca_iof_proxy_la_LIBADD = \
--- a/orte/mca/iof/svc/Makefile.am
+++ b/orte/mca/iof/svc/Makefile.am
@ -43,7 +43,7 @@ svc_SOURCES = \
    iof_svc_sub.h \
    iof_svc_sub.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_iof_svc_la_SOURCES = $(svc_SOURCES)
 mca_iof_svc_la_LIBADD = \
--- a/orte/mca/ns/proxy/Makefile.am
+++ b/orte/mca/ns/proxy/Makefile.am
@ -36,7 +36,7 @@ component_noinst = libmca_ns_proxy.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ns_proxy_la_SOURCES = $(sources)
 mca_ns_proxy_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/ns/replica/Makefile.am
+++ b/orte/mca/ns/replica/Makefile.am
@ -39,7 +39,7 @@ component_noinst = libmca_ns_replica.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ns_replica_la_SOURCES = $(sources)
 mca_ns_replica_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/odls/bproc/Makefile.am
+++ b/orte/mca/odls/bproc/Makefile.am
@ -36,7 +36,7 @@ sources = \
    odls_bproc.c \
    odls_bproc_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_odls_bproc_la_SOURCES = $(sources)
 mca_odls_bproc_la_LIBADD = \
--- a/orte/mca/odls/default/Makefile.am
+++ b/orte/mca/odls/default/Makefile.am
@ -35,7 +35,7 @@ component_noinst = libmca_odls_default.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_odls_default_la_SOURCES = $(sources)
 mca_odls_default_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/odls/process/Makefile.am
+++ b/orte/mca/odls/process/Makefile.am
@ -31,7 +31,7 @@ component_noinst = libmca_odls_process.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_odls_process_la_SOURCES = $(sources)
 mca_odls_process_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/oob/tcp/Makefile.am
+++ b/orte/mca/oob/tcp/Makefile.am
@ -46,7 +46,7 @@ component_noinst = libmca_oob_tcp.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_oob_tcp_la_SOURCES = $(sources)
 mca_oob_tcp_la_LIBADD = \
--- a/orte/mca/pls/bproc/Makefile.am
+++ b/orte/mca/pls/bproc/Makefile.am
@ -36,7 +36,7 @@ sources = \
    pls_bproc_state.c \
    pls_bproc_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_bproc_la_SOURCES = $(sources)
 mca_pls_bproc_la_LIBADD = \
--- a/orte/mca/pls/cnos/Makefile.am
+++ b/orte/mca/pls/cnos/Makefile.am
@ -35,7 +35,7 @@ cnos_SOURCES = \
    pls_cnos.h \
    pls_cnos_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_cnos_la_SOURCES = $(cnos_SOURCES)
 mca_pls_cnos_la_LIBADD = \
--- a/orte/mca/pls/gridengine/Makefile.am
+++ b/orte/mca/pls/gridengine/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_pls_gridengine.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_gridengine_la_SOURCES = $(sources)
 mca_pls_gridengine_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/pls/poe/Makefile.am
+++ b/orte/mca/pls/poe/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_pls_poe.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_poe_la_SOURCES = $(sources)
 mca_pls_poe_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/pls/proxy/Makefile.am
+++ b/orte/mca/pls/proxy/Makefile.am
@ -37,7 +37,7 @@ proxy_SOURCES = \
    pls_proxy.h \
    pls_proxy_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_proxy_la_SOURCES = $(proxy_SOURCES)
 mca_pls_proxy_la_LIBADD = \
--- a/orte/mca/pls/rsh/Makefile.am
+++ b/orte/mca/pls/rsh/Makefile.am
@ -35,7 +35,7 @@ component_noinst = libmca_pls_rsh.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_rsh_la_SOURCES = $(sources)
 mca_pls_rsh_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/pls/slurm/Makefile.am
+++ b/orte/mca/pls/slurm/Makefile.am
@ -35,7 +35,7 @@ component_noinst = libmca_pls_slurm.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_slurm_la_SOURCES = $(sources)
 mca_pls_slurm_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/pls/tm/Makefile.am
+++ b/orte/mca/pls/tm/Makefile.am
@ -41,7 +41,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_pls_tm_la_SOURCES = $(component_sources)
 mca_pls_tm_la_LDFLAGS = -module -avoid-version $(pls_tm_LDFLAGS)
--- a/orte/mca/pls/xcpu/Makefile.am
+++ b/orte/mca/pls/xcpu/Makefile.am
@ -36,7 +36,7 @@ sources = \
    pls_xcpu_component.c \
    poll.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_xcpu_la_SOURCES = $(sources)
 mca_pls_xcpu_la_LIBADD = \
--- a/orte/mca/pls/xgrid/Makefile.am
+++ b/orte/mca/pls/xgrid/Makefile.am
@ -53,7 +53,7 @@ component_noinst = libmca_pls_xgrid.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_xgrid_la_SOURCES = $(xgrid_sources)
 mca_pls_xgrid_la_LIBADD = \
--- a/orte/mca/ras/bjs/Makefile.am
+++ b/orte/mca/ras/bjs/Makefile.am
@ -39,7 +39,7 @@ proxy_SOURCES = \
    ras_bjs.h \
    ras_bjs_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_bjs_la_SOURCES = $(proxy_SOURCES)
 mca_ras_bjs_la_LIBADD = \
--- a/orte/mca/ras/dash_host/Makefile.am
+++ b/orte/mca/ras/dash_host/Makefile.am
@ -33,7 +33,7 @@ dash_host_SOURCES = \
    ras_dash_host_module.c \
    ras_dash_host_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_dash_host_la_SOURCES = $(dash_host_SOURCES)
 mca_ras_dash_host_la_LIBADD = \
--- a/orte/mca/ras/gridengine/Makefile.am
+++ b/orte/mca/ras/gridengine/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_ras_gridengine.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_gridengine_la_SOURCES = $(sources)
 mca_ras_gridengine_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/ras/loadleveler/Makefile.am
+++ b/orte/mca/ras/loadleveler/Makefile.am
@ -44,7 +44,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_ras_loadleveler_la_SOURCES = $(component_sources)
 mca_ras_loadleveler_la_LDFLAGS = -module -avoid-version $(ras_loadleveler_LDFLAGS)
--- a/orte/mca/ras/localhost/Makefile.am
+++ b/orte/mca/ras/localhost/Makefile.am
@ -33,7 +33,7 @@ localhost_SOURCES = \
    ras_localhost_module.c \
    ras_localhost_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_localhost_la_SOURCES = $(localhost_SOURCES)
 mca_ras_localhost_la_LIBADD = \
--- a/orte/mca/ras/lsf_bproc/Makefile.am
+++ b/orte/mca/ras/lsf_bproc/Makefile.am
@ -39,7 +39,7 @@ proxy_SOURCES = \
    ras_lsf_bproc.h \
    ras_lsf_bproc_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_lsf_bproc_la_SOURCES = $(proxy_SOURCES)
 mca_ras_lsf_bproc_la_LIBADD = \
--- a/orte/mca/ras/slurm/Makefile.am
+++ b/orte/mca/ras/slurm/Makefile.am
@ -42,7 +42,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_ras_slurm_la_SOURCES = $(component_sources)
 mca_ras_slurm_la_LDFLAGS = -module -avoid-version $(ras_slurm_LDFLAGS)
--- a/orte/mca/ras/tm/Makefile.am
+++ b/orte/mca/ras/tm/Makefile.am
@ -44,7 +44,7 @@ component =
 component_sources =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_ras_tm_la_SOURCES = $(component_sources)
 mca_ras_tm_la_LDFLAGS = -module -avoid-version $(ras_tm_LDFLAGS)
--- a/orte/mca/ras/xgrid/Makefile.am
+++ b/orte/mca/ras/xgrid/Makefile.am
@ -51,7 +51,7 @@ component_noinst = libmca_ras_xgrid.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_xgrid_la_SOURCES = $(xgrid_sources)
 mca_ras_xgrid_la_LIBADD = \
--- a/orte/mca/rds/hostfile/Makefile.am
+++ b/orte/mca/rds/hostfile/Makefile.am
@ -43,7 +43,7 @@ proxy_SOURCES = \
    rds_hostfile.h \
    rds_hostfile_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_rds_hostfile_la_SOURCES = $(proxy_SOURCES)
 mca_rds_hostfile_la_LIBADD = \
--- a/orte/mca/rds/proxy/Makefile.am
+++ b/orte/mca/rds/proxy/Makefile.am
@ -37,7 +37,7 @@ proxy_SOURCES = \
    rds_proxy.h \
    rds_proxy_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_rds_proxy_la_SOURCES = $(proxy_SOURCES)
 mca_rds_proxy_la_LIBADD = \
--- a/orte/mca/rds/resfile/Makefile.am
+++ b/orte/mca/rds/resfile/Makefile.am
@ -38,7 +38,7 @@ proxy_SOURCES = \
    rds_resfile.h \
    rds_resfile_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_rds_resfile_la_SOURCES = $(proxy_SOURCES)
 mca_rds_resfile_la_LIBADD = \
--- a/orte/mca/rmaps/round_robin/Makefile.am
+++ b/orte/mca/rmaps/round_robin/Makefile.am
@ -35,7 +35,7 @@ component_noinst = libmca_rmaps_round_robin.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_rmaps_round_robin_la_SOURCES = $(sources)
 mca_rmaps_round_robin_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/rmgr/cnos/Makefile.am
+++ b/orte/mca/rmgr/cnos/Makefile.am
@ -35,7 +35,7 @@ cnos_SOURCES = \
    rmgr_cnos.h \
    rmgr_cnos_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_rmgr_cnos_la_SOURCES = $(cnos_SOURCES)
 mca_rmgr_cnos_la_LIBADD = \
--- a/orte/mca/rmgr/proxy/Makefile.am
+++ b/orte/mca/rmgr/proxy/Makefile.am
@ -35,7 +35,7 @@ proxy_SOURCES = \
    rmgr_proxy.h \
    rmgr_proxy_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_rmgr_proxy_la_SOURCES = $(proxy_SOURCES)
 mca_rmgr_proxy_la_LIBADD = \
--- a/orte/mca/rmgr/urm/Makefile.am
+++ b/orte/mca/rmgr/urm/Makefile.am
@ -37,7 +37,7 @@ proxy_SOURCES = \
    rmgr_urm.h \
    rmgr_urm_component.c

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_rmgr_urm_la_SOURCES = $(proxy_SOURCES)
 mca_rmgr_urm_la_LIBADD = \
--- a/orte/mca/rml/cnos/Makefile.am
+++ b/orte/mca/rml/cnos/Makefile.am
@ -36,7 +36,7 @@ component_noinst = libmca_rml_cnos.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_rml_cnos_la_SOURCES = $(sources)
 mca_rml_cnos_la_LIBADD = \
--- a/orte/mca/rml/ftrm/Makefile.am
+++ b/orte/mca/rml/ftrm/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_rml_ftrm.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_rml_ftrm_la_SOURCES = $(sources)
 mca_rml_ftrm_la_LIBADD = \
--- a/orte/mca/rml/oob/Makefile.am
+++ b/orte/mca/rml/oob/Makefile.am
@ -36,7 +36,7 @@ component_noinst = libmca_rml_oob.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_rml_oob_la_SOURCES = $(sources)
 mca_rml_oob_la_LIBADD = \
--- a/orte/mca/sds/bproc/Makefile.am
+++ b/orte/mca/sds/bproc/Makefile.am
@ -39,7 +39,7 @@ component_noinst = libmca_sds_bproc.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_sds_bproc_la_SOURCES = $(sources)
 mca_sds_bproc_la_LDFLAGS = -module -avoid-version $(sds_bproc_LDFLAGS)
--- a/orte/mca/sds/cnos/Makefile.am
+++ b/orte/mca/sds/cnos/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_sds_cnos.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_sds_cnos_la_SOURCES = $(sources)
 mca_sds_cnos_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/sds/env/Makefile.am
+++ b/orte/mca/sds/env/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_sds_env.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_sds_env_la_SOURCES = $(sources)
 mca_sds_env_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/sds/pipe/Makefile.am
+++ b/orte/mca/sds/pipe/Makefile.am
@ -37,7 +37,7 @@ component_noinst = libmca_sds_pipe.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_sds_pipe_la_SOURCES = $(sources)
 mca_sds_pipe_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/sds/portals_utcp/Makefile.am
+++ b/orte/mca/sds/portals_utcp/Makefile.am
@ -39,7 +39,7 @@ component_noinst = libmca_sds_portals_utcp.la
 component_install =
 endif

-mcacomponentdir = $(libdir)/openmpi
+mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_sds_portals_utcp_la_SOURCES = $(sources)
 mca_sds_portals_utcp_la_LDFLAGS = -module -avoid-version $(sds_portals_utcp_LDFLAGS)
--- a/Показать больше
+++ b/Показать больше