From 8b778903d84e581ec30173bea87d78d823903f59 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Tue, 7 Jan 2014 22:11:15 +0000 Subject: [PATCH] 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. --- configure.ac | 12 +++++++++++- contrib/Makefile.am | 2 +- ompi/Makefile.am | 4 ++-- ompi/datatype/Makefile.am | 2 +- ompi/debuggers/Makefile.am | 6 +++--- ompi/errhandler/Makefile.am | 2 +- ompi/include/Makefile.am | 2 +- ompi/mca/allocator/Makefile.am | 2 +- ompi/mca/allocator/basic/Makefile.am | 2 +- ompi/mca/allocator/bucket/Makefile.am | 2 +- ompi/mca/bcol/Makefile.am | 2 +- ompi/mca/bcol/basesmuma/Makefile.am | 2 +- ompi/mca/bcol/iboffload/Makefile.am | 2 +- ompi/mca/bcol/ptpcoll/Makefile.am | 2 +- ompi/mca/bml/Makefile.am | 2 +- ompi/mca/bml/r2/Makefile.am | 4 ++-- ompi/mca/btl/Makefile.am | 2 +- ompi/mca/btl/base/Makefile.am | 2 +- ompi/mca/btl/openib/Makefile.am | 8 ++++---- ompi/mca/btl/portals4/Makefile.am | 2 +- ompi/mca/btl/scif/Makefile.am | 2 +- ompi/mca/btl/sctp/Makefile.am | 2 +- ompi/mca/btl/self/Makefile.am | 2 +- ompi/mca/btl/sm/Makefile.am | 4 ++-- ompi/mca/btl/smcuda/Makefile.am | 4 ++-- ompi/mca/btl/tcp/Makefile.am | 4 ++-- ompi/mca/btl/template/Makefile.am | 2 +- ompi/mca/btl/ugni/Makefile.am | 2 +- ompi/mca/btl/usnic/Makefile.am | 4 ++-- ompi/mca/btl/vader/Makefile.am | 4 ++-- ompi/mca/coll/Makefile.am | 2 +- ompi/mca/coll/base/Makefile.am | 2 +- ompi/mca/coll/basic/Makefile.am | 2 +- ompi/mca/coll/demo/Makefile.am | 2 +- ompi/mca/coll/fca/Makefile.am | 4 ++-- ompi/mca/coll/hcoll/Makefile.am | 2 +- ompi/mca/coll/hierarch/Makefile.am | 2 +- ompi/mca/coll/inter/Makefile.am | 2 +- ompi/mca/coll/libnbc/Makefile.am | 2 +- ompi/mca/coll/ml/Makefile.am | 4 ++-- ompi/mca/coll/portals4/Makefile.am | 2 +- ompi/mca/coll/self/Makefile.am | 2 +- ompi/mca/coll/sm/Makefile.am | 4 ++-- ompi/mca/coll/tuned/Makefile.am | 2 +- ompi/mca/common/cuda/Makefile.am | 4 ++-- ompi/mca/common/ofacm/Makefile.am | 4 ++-- ompi/mca/common/sm/Makefile.am | 4 ++-- ompi/mca/common/ugni/Makefile.am | 2 +- ompi/mca/common/verbs/Makefile.am | 4 ++-- ompi/mca/crcp/Makefile.am | 2 +- ompi/mca/crcp/base/Makefile.am | 2 +- ompi/mca/crcp/bkmrk/Makefile.am | 4 ++-- ompi/mca/dpm/Makefile.am | 2 +- ompi/mca/dpm/base/Makefile.am | 2 +- ompi/mca/dpm/orte/Makefile.am | 4 ++-- ompi/mca/fbtl/Makefile.am | 2 +- ompi/mca/fbtl/posix/Makefile.am | 2 +- ompi/mca/fbtl/pvfs2/Makefile.am | 2 +- ompi/mca/fcoll/Makefile.am | 2 +- ompi/mca/fcoll/dynamic/Makefile.am | 2 +- ompi/mca/fcoll/individual/Makefile.am | 2 +- ompi/mca/fcoll/static/Makefile.am | 2 +- ompi/mca/fcoll/two_phase/Makefile.am | 2 +- ompi/mca/fs/Makefile.am | 2 +- ompi/mca/fs/lustre/Makefile.am | 2 +- ompi/mca/fs/pvfs2/Makefile.am | 2 +- ompi/mca/fs/ufs/Makefile.am | 2 +- ompi/mca/io/Makefile.am | 2 +- ompi/mca/io/ompio/Makefile.am | 2 +- ompi/mca/io/romio/Makefile.am | 2 +- ompi/mca/mpool/Makefile.am | 4 ++-- ompi/mca/mpool/base/Makefile.am | 2 +- ompi/mca/mpool/gpusm/Makefile.am | 4 ++-- ompi/mca/mpool/grdma/Makefile.am | 4 ++-- ompi/mca/mpool/rgpusm/Makefile.am | 4 ++-- ompi/mca/mpool/sm/Makefile.am | 2 +- ompi/mca/mpool/udreg/Makefile.am | 4 ++-- ompi/mca/mtl/Makefile.am | 2 +- ompi/mca/mtl/mxm/Makefile.am | 4 ++-- ompi/mca/mtl/portals4/Makefile.am | 2 +- ompi/mca/mtl/psm/Makefile.am | 4 ++-- ompi/mca/op/Makefile.am | 2 +- ompi/mca/op/base/Makefile.include | 2 +- ompi/mca/op/example/Makefile.am | 4 ++-- ompi/mca/op/x86/Makefile.am | 4 ++-- ompi/mca/osc/Makefile.am | 2 +- ompi/mca/osc/pt2pt/Makefile.am | 2 +- ompi/mca/osc/rdma/Makefile.am | 2 +- ompi/mca/pml/Makefile.am | 2 +- ompi/mca/pml/bfo/Makefile.am | 4 ++-- ompi/mca/pml/cm/Makefile.am | 2 +- ompi/mca/pml/crcpw/Makefile.am | 2 +- ompi/mca/pml/example/Makefile.am | 2 +- ompi/mca/pml/ob1/Makefile.am | 4 ++-- ompi/mca/pml/v/Makefile.am | 2 +- ompi/mca/pubsub/Makefile.am | 2 +- ompi/mca/pubsub/orte/Makefile.am | 4 ++-- ompi/mca/pubsub/pmi/Makefile.am | 2 +- ompi/mca/rcache/Makefile.am | 2 +- ompi/mca/rcache/vma/Makefile.am | 2 +- ompi/mca/rte/Makefile.am | 2 +- ompi/mca/rte/orte/Makefile.am | 2 +- ompi/mca/rte/pmi/Makefile.am | 2 +- ompi/mca/sbgp/Makefile.am | 2 +- ompi/mca/sbgp/basesmsocket/Makefile.am | 2 +- ompi/mca/sbgp/basesmuma/Makefile.am | 2 +- ompi/mca/sbgp/ibnet/Makefile.am | 2 +- ompi/mca/sbgp/p2p/Makefile.am | 2 +- ompi/mca/sharedfp/Makefile.am | 2 +- ompi/mca/sharedfp/addproc/Makefile.am | 2 +- ompi/mca/sharedfp/individual/Makefile.am | 2 +- ompi/mca/sharedfp/lockedfile/Makefile.am | 2 +- ompi/mca/sharedfp/sm/Makefile.am | 2 +- ompi/mca/topo/Makefile.am | 2 +- ompi/mca/topo/basic/Makefile.am | 2 +- ompi/mca/vprotocol/Makefile.am | 2 +- ompi/mca/vprotocol/example/Makefile.am | 2 +- ompi/mca/vprotocol/pessimist/Makefile.am | 2 +- ompi/mpi/Makefile.am | 2 +- ompi/mpi/c/Makefile.am | 2 +- ompi/mpi/c/profile/Makefile.am | 2 +- ompi/mpi/cxx/Makefile.am | 2 +- ompi/mpi/fortran/mpif-h/Makefile.am | 2 +- ompi/mpi/fortran/mpif-h/profile/Makefile.am | 2 +- ompi/mpi/java/c/Makefile.am | 2 +- ompi/mpi/java/java/Makefile.am | 2 +- ompi/mpi/tool/Makefile.am | 2 +- ompi/mpi/tool/profile/Makefile.am | 2 +- ompi/mpiext/affinity/c/Makefile.am | 2 +- ompi/mpiext/cr/c/Makefile.am | 2 +- ompi/mpiext/example/c/Makefile.am | 2 +- ompi/mpiext/example/mpif-h/Makefile.am | 2 +- ompi/runtime/Makefile.am | 2 +- ompi/tools/wrappers/Makefile.am | 2 +- opal/Makefile.am | 4 ++-- opal/datatype/Makefile.am | 2 +- opal/include/Makefile.am | 2 +- opal/mca/backtrace/Makefile.am | 2 +- opal/mca/base/Makefile.am | 4 ++-- opal/mca/compress/Makefile.am | 2 +- opal/mca/compress/base/Makefile.am | 2 +- opal/mca/compress/bzip/Makefile.am | 4 ++-- opal/mca/compress/gzip/Makefile.am | 4 ++-- opal/mca/crs/Makefile.am | 2 +- opal/mca/crs/base/Makefile.am | 2 +- opal/mca/crs/blcr/Makefile.am | 4 ++-- opal/mca/crs/dmtcp/Makefile.am | 4 ++-- opal/mca/crs/none/Makefile.am | 4 ++-- opal/mca/crs/self/Makefile.am | 4 ++-- opal/mca/db/Makefile.am | 4 ++-- opal/mca/db/base/Makefile.am | 2 +- opal/mca/db/hash/Makefile.am | 2 +- opal/mca/db/pmi/Makefile.am | 2 +- opal/mca/db/print/Makefile.am | 2 +- opal/mca/db/sqlite/Makefile.am | 4 ++-- opal/mca/event/Makefile.am | 2 +- opal/mca/event/libevent2021/Makefile.am | 2 +- opal/mca/hwloc/Makefile.am | 2 +- opal/mca/hwloc/base/Makefile.am | 2 +- opal/mca/hwloc/hwloc172/Makefile.am | 2 +- opal/mca/hwloc/hwloc172/hwloc/Makefile.am | 2 +- opal/mca/if/Makefile.am | 2 +- opal/mca/installdirs/Makefile.am | 2 +- opal/mca/installdirs/config/install_dirs.h.in | 6 +++--- opal/mca/memchecker/Makefile.am | 2 +- opal/mca/memcpy/Makefile.am | 2 +- opal/mca/memory/Makefile.am | 2 +- opal/mca/memory/linux/Makefile.am | 4 ++-- opal/mca/pstat/Makefile.am | 2 +- opal/mca/pstat/linux/Makefile.am | 2 +- opal/mca/pstat/test/Makefile.am | 2 +- opal/mca/shmem/Makefile.am | 2 +- opal/mca/shmem/mmap/Makefile.am | 4 ++-- opal/mca/shmem/posix/Makefile.am | 4 ++-- opal/mca/shmem/sysv/Makefile.am | 4 ++-- opal/mca/timer/Makefile.am | 2 +- opal/runtime/Makefile.am | 2 +- opal/tools/opal-checkpoint/Makefile.am | 2 +- opal/tools/opal-restart/Makefile.am | 2 +- opal/tools/wrappers/Makefile.am | 4 ++-- opal/util/Makefile.am | 4 ++-- orte/Makefile.am | 4 ++-- orte/include/Makefile.am | 2 +- orte/mca/dfs/Makefile.am | 2 +- orte/mca/dfs/app/Makefile.am | 2 +- orte/mca/dfs/orted/Makefile.am | 2 +- orte/mca/dfs/test/Makefile.am | 2 +- orte/mca/errmgr/Makefile.am | 4 ++-- orte/mca/errmgr/base/Makefile.am | 2 +- orte/mca/errmgr/default_app/Makefile.am | 2 +- orte/mca/errmgr/default_hnp/Makefile.am | 2 +- orte/mca/errmgr/default_orted/Makefile.am | 2 +- orte/mca/errmgr/default_tool/Makefile.am | 2 +- orte/mca/ess/Makefile.am | 4 ++-- orte/mca/ess/alps/Makefile.am | 2 +- orte/mca/ess/base/Makefile.am | 2 +- orte/mca/ess/env/Makefile.am | 2 +- orte/mca/ess/hnp/Makefile.am | 2 +- orte/mca/ess/lsf/Makefile.am | 2 +- orte/mca/ess/pmi/Makefile.am | 2 +- orte/mca/ess/singleton/Makefile.am | 2 +- orte/mca/ess/slurm/Makefile.am | 2 +- orte/mca/ess/tm/Makefile.am | 2 +- orte/mca/ess/tool/Makefile.am | 2 +- orte/mca/filem/Makefile.am | 2 +- orte/mca/filem/base/Makefile.am | 2 +- orte/mca/filem/raw/Makefile.am | 4 ++-- orte/mca/grpcomm/Makefile.am | 2 +- orte/mca/grpcomm/bad/Makefile.am | 2 +- orte/mca/grpcomm/hier/Makefile.am | 2 +- orte/mca/grpcomm/pmi/Makefile.am | 2 +- orte/mca/iof/Makefile.am | 2 +- orte/mca/iof/hnp/Makefile.am | 2 +- orte/mca/iof/mr_hnp/Makefile.am | 2 +- orte/mca/iof/mr_orted/Makefile.am | 2 +- orte/mca/iof/orted/Makefile.am | 2 +- orte/mca/iof/tool/Makefile.am | 2 +- orte/mca/odls/Makefile.am | 4 ++-- orte/mca/odls/base/Makefile.am | 2 +- orte/mca/odls/default/Makefile.am | 4 ++-- orte/mca/oob/Makefile.am | 2 +- orte/mca/oob/tcp/Makefile.am | 2 +- orte/mca/oob/ud/Makefile.am | 4 ++-- orte/mca/plm/Makefile.am | 4 ++-- orte/mca/plm/alps/Makefile.am | 4 ++-- orte/mca/plm/base/Makefile.am | 2 +- orte/mca/plm/lsf/Makefile.am | 4 ++-- orte/mca/plm/rsh/Makefile.am | 4 ++-- orte/mca/plm/slurm/Makefile.am | 4 ++-- orte/mca/plm/tm/Makefile.am | 4 ++-- orte/mca/ras/Makefile.am | 4 ++-- orte/mca/ras/alps/Makefile.am | 4 ++-- orte/mca/ras/base/Makefile.am | 2 +- orte/mca/ras/gridengine/Makefile.am | 4 ++-- orte/mca/ras/loadleveler/Makefile.am | 2 +- orte/mca/ras/lsf/Makefile.am | 4 ++-- orte/mca/ras/simulator/Makefile.am | 4 ++-- orte/mca/ras/slurm/Makefile.am | 4 ++-- orte/mca/ras/tm/Makefile.am | 4 ++-- orte/mca/rmaps/Makefile.am | 2 +- orte/mca/rmaps/base/Makefile.am | 2 +- orte/mca/rmaps/lama/Makefile.am | 4 ++-- orte/mca/rmaps/mindist/Makefile.am | 4 ++-- orte/mca/rmaps/ppr/Makefile.am | 4 ++-- orte/mca/rmaps/rank_file/Makefile.am | 4 ++-- orte/mca/rmaps/resilient/Makefile.am | 4 ++-- orte/mca/rmaps/round_robin/Makefile.am | 4 ++-- orte/mca/rmaps/seq/Makefile.am | 4 ++-- orte/mca/rmaps/staged/Makefile.am | 2 +- orte/mca/rml/Makefile.am | 2 +- orte/mca/rml/ftrm/Makefile.am | 2 +- orte/mca/rml/oob/Makefile.am | 2 +- orte/mca/routed/Makefile.am | 2 +- orte/mca/routed/binomial/Makefile.am | 2 +- orte/mca/routed/debruijn/Makefile.am | 2 +- orte/mca/routed/direct/Makefile.am | 2 +- orte/mca/routed/radix/Makefile.am | 2 +- orte/mca/sensor/Makefile.am | 2 +- orte/mca/sensor/file/Makefile.am | 4 ++-- orte/mca/sensor/ft_tester/Makefile.am | 2 +- orte/mca/sensor/heartbeat/Makefile.am | 4 ++-- orte/mca/sensor/resusage/Makefile.am | 4 ++-- orte/mca/snapc/Makefile.am | 2 +- orte/mca/snapc/base/Makefile.am | 2 +- orte/mca/snapc/full/Makefile.am | 4 ++-- orte/mca/sstore/Makefile.am | 2 +- orte/mca/sstore/base/Makefile.am | 2 +- orte/mca/sstore/central/Makefile.am | 4 ++-- orte/mca/sstore/stage/Makefile.am | 4 ++-- orte/mca/state/Makefile.am | 4 ++-- orte/mca/state/app/Makefile.am | 2 +- orte/mca/state/hnp/Makefile.am | 2 +- orte/mca/state/novm/Makefile.am | 2 +- orte/mca/state/orted/Makefile.am | 2 +- orte/mca/state/staged_hnp/Makefile.am | 4 ++-- orte/mca/state/staged_orted/Makefile.am | 2 +- orte/mca/state/tool/Makefile.am | 2 +- orte/orted/Makefile.am | 2 +- orte/runtime/Makefile.am | 2 +- orte/tools/orte-checkpoint/Makefile.am | 2 +- orte/tools/orte-clean/Makefile.am | 2 +- orte/tools/orte-info/Makefile.am | 2 +- orte/tools/orte-migrate/Makefile.am | 2 +- orte/tools/orte-ps/Makefile.am | 2 +- orte/tools/orte-restart/Makefile.am | 2 +- orte/tools/orte-server/Makefile.am | 2 +- orte/tools/orte-top/Makefile.am | 2 +- orte/tools/orterun/Makefile.am | 2 +- orte/tools/wrappers/Makefile.am | 2 +- orte/util/Makefile.am | 2 +- oshmem/Makefile.am | 9 +++------ oshmem/include/Makefile.am | 7 ------- oshmem/mca/atomic/Makefile.am | 12 +++--------- oshmem/mca/atomic/basic/Makefile.am | 2 +- oshmem/mca/atomic/mxm/Makefile.am | 2 +- oshmem/mca/memheap/Makefile.am | 14 ++++---------- oshmem/mca/memheap/base/Makefile.am | 2 +- oshmem/mca/memheap/buddy/Makefile.am | 2 +- oshmem/mca/memheap/ptmalloc/Makefile.am | 2 +- oshmem/mca/scoll/Makefile.am | 12 +++--------- oshmem/mca/scoll/basic/Makefile.am | 2 +- oshmem/mca/scoll/fca/Makefile.am | 2 +- oshmem/mca/spml/Makefile.am | 12 +++--------- oshmem/mca/spml/ikrit/Makefile.am | 4 ++-- oshmem/mca/spml/yoda/Makefile.am | 4 ++-- oshmem/runtime/Makefile.am | 2 +- oshmem/shmem/Makefile.am | 2 +- oshmem/shmem/c/Makefile.am | 4 +--- oshmem/shmem/c/profile/Makefile.am | 4 +--- oshmem/shmem/fortran/Makefile.am | 4 +--- oshmem/tools/wrappers/Makefile.am | 2 +- 311 files changed, 419 insertions(+), 449 deletions(-) diff --git a/configure.ac b/configure.ac index d30f74a493..102c7bb197 100644 --- 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" diff --git a/contrib/Makefile.am b/contrib/Makefile.am index f37d216a96..baacbbfbab 100644 --- 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 diff --git a/ompi/Makefile.am b/ompi/Makefile.am index d07e23665a..2495aab2ab 100644 --- 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 diff --git a/ompi/datatype/Makefile.am b/ompi/datatype/Makefile.am index 68d601f5de..2897c005ca 100644 --- 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 diff --git a/ompi/debuggers/Makefile.am b/ompi/debuggers/Makefile.am index 0af81bcb2e..2adf3fd3c3 100644 --- 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 diff --git a/ompi/errhandler/Makefile.am b/ompi/errhandler/Makefile.am index 11de1c9cc3..8d66dade4c 100644 --- 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 \ diff --git a/ompi/include/Makefile.am b/ompi/include/Makefile.am index d96b866f43..3e6f87d58b 100644 --- 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 diff --git a/ompi/mca/allocator/Makefile.am b/ompi/mca/allocator/Makefile.am index 3a6818bc72..6506532351 100644 --- 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 diff --git a/ompi/mca/allocator/basic/Makefile.am b/ompi/mca/allocator/basic/Makefile.am index fb8c168585..4c6e45ffb0 100644 --- 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 diff --git a/ompi/mca/allocator/bucket/Makefile.am b/ompi/mca/allocator/bucket/Makefile.am index 8836f46807..92d4389fc8 100644 --- 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 diff --git a/ompi/mca/bcol/Makefile.am b/ompi/mca/bcol/Makefile.am index dc46a33975..9f78f939f0 100644 --- 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 diff --git a/ompi/mca/bcol/basesmuma/Makefile.am b/ompi/mca/bcol/basesmuma/Makefile.am index 4ba7e8883b..6f80e17b8e 100644 --- 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) diff --git a/ompi/mca/bcol/iboffload/Makefile.am b/ompi/mca/bcol/iboffload/Makefile.am index b9e4395364..3a80932cb0 100644 --- 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) diff --git a/ompi/mca/bcol/ptpcoll/Makefile.am b/ompi/mca/bcol/ptpcoll/Makefile.am index 3e3288a728..c9444a741b 100644 --- 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 diff --git a/ompi/mca/bml/Makefile.am b/ompi/mca/bml/Makefile.am index 5572d2f43d..b8463a4d79 100644 --- 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 diff --git a/ompi/mca/bml/r2/Makefile.am b/ompi/mca/bml/r2/Makefile.am index 6b4810f154..1ed9b51909 100644 --- 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 diff --git a/ompi/mca/btl/Makefile.am b/ompi/mca/btl/Makefile.am index 2c8afca7b3..513bc02ea4 100644 --- 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 diff --git a/ompi/mca/btl/base/Makefile.am b/ompi/mca/btl/base/Makefile.am index 336edb4615..dafe14be62 100644 --- 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 \ diff --git a/ompi/mca/btl/openib/Makefile.am b/ompi/mca/btl/openib/Makefile.am index faa2a4fb14..5e1e06cc94 100644 --- 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) diff --git a/ompi/mca/btl/portals4/Makefile.am b/ompi/mca/btl/portals4/Makefile.am index 8bf6a551c9..b6a4d934d0 100644 --- 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 = \ diff --git a/ompi/mca/btl/scif/Makefile.am b/ompi/mca/btl/scif/Makefile.am index 37f274c275..484c661488 100644 --- 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) diff --git a/ompi/mca/btl/sctp/Makefile.am b/ompi/mca/btl/sctp/Makefile.am index 4c310e480a..9d531fedf6 100644 --- 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) diff --git a/ompi/mca/btl/self/Makefile.am b/ompi/mca/btl/self/Makefile.am index 64a7073c41..0e386807ef 100644 --- 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 diff --git a/ompi/mca/btl/sm/Makefile.am b/ompi/mca/btl/sm/Makefile.am index ba0dc9a1a6..eeb36071e2 100644 --- 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 diff --git a/ompi/mca/btl/smcuda/Makefile.am b/ompi/mca/btl/smcuda/Makefile.am index 9675c45fbf..6d3df5f6da 100644 --- 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 diff --git a/ompi/mca/btl/tcp/Makefile.am b/ompi/mca/btl/tcp/Makefile.am index 3405c79978..f545b61516 100644 --- 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 diff --git a/ompi/mca/btl/template/Makefile.am b/ompi/mca/btl/template/Makefile.am index 07c264a815..5bd5e06473 100644 --- 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 diff --git a/ompi/mca/btl/ugni/Makefile.am b/ompi/mca/btl/ugni/Makefile.am index a4463a5f0c..71606772d8 100644 --- 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) diff --git a/ompi/mca/btl/usnic/Makefile.am b/ompi/mca/btl/usnic/Makefile.am index 57319493e2..8906bd7217 100644 --- 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) diff --git a/ompi/mca/btl/vader/Makefile.am b/ompi/mca/btl/vader/Makefile.am index 60e715f92b..d47ca83460 100644 --- 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) diff --git a/ompi/mca/coll/Makefile.am b/ompi/mca/coll/Makefile.am index 31eda4ddd4..51630d2543 100644 --- 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 diff --git a/ompi/mca/coll/base/Makefile.am b/ompi/mca/coll/base/Makefile.am index 0f1b82f77b..ca608693ca 100644 --- 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 \ diff --git a/ompi/mca/coll/basic/Makefile.am b/ompi/mca/coll/basic/Makefile.am index 6e524407c1..403637882c 100644 --- 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 diff --git a/ompi/mca/coll/demo/Makefile.am b/ompi/mca/coll/demo/Makefile.am index 1b17fda324..8c2a9eaea8 100644 --- 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 diff --git a/ompi/mca/coll/fca/Makefile.am b/ompi/mca/coll/fca/Makefile.am index b3ecfef3aa..35e22e44e0 100644 --- 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) diff --git a/ompi/mca/coll/hcoll/Makefile.am b/ompi/mca/coll/hcoll/Makefile.am index 3d4403cfa1..709b5376cd 100644 --- 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) diff --git a/ompi/mca/coll/hierarch/Makefile.am b/ompi/mca/coll/hierarch/Makefile.am index 5a88bb91e2..9cac44051c 100644 --- 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 diff --git a/ompi/mca/coll/inter/Makefile.am b/ompi/mca/coll/inter/Makefile.am index 48791141e9..d61c5c6754 100644 --- 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 diff --git a/ompi/mca/coll/libnbc/Makefile.am b/ompi/mca/coll/libnbc/Makefile.am index 9514ae1892..d630413e00 100644 --- 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 diff --git a/ompi/mca/coll/ml/Makefile.am b/ompi/mca/coll/ml/Makefile.am index 7c2e564fea..498570fdc5 100644 --- 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 diff --git a/ompi/mca/coll/portals4/Makefile.am b/ompi/mca/coll/portals4/Makefile.am index 8eef95fa15..874ce8ff65 100644 --- 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) diff --git a/ompi/mca/coll/self/Makefile.am b/ompi/mca/coll/self/Makefile.am index b53ad43e9b..cbaddd00b8 100644 --- 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 diff --git a/ompi/mca/coll/sm/Makefile.am b/ompi/mca/coll/sm/Makefile.am index 7e80e2aa52..ee6fe37099 100644 --- 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 diff --git a/ompi/mca/coll/tuned/Makefile.am b/ompi/mca/coll/tuned/Makefile.am index ee3e9e913c..1319499057 100644 --- 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 diff --git a/ompi/mca/common/cuda/Makefile.am b/ompi/mca/common/cuda/Makefile.am index d10f2b49fb..0a1cc1e7ba 100644 --- 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 diff --git a/ompi/mca/common/ofacm/Makefile.am b/ompi/mca/common/ofacm/Makefile.am index 9c5c646ff3..0aa8e71dea 100644 --- 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) diff --git a/ompi/mca/common/sm/Makefile.am b/ompi/mca/common/sm/Makefile.am index 5c9b27de2d..e597f1a9d5 100644 --- 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 diff --git a/ompi/mca/common/ugni/Makefile.am b/ompi/mca/common/ugni/Makefile.am index 89d3f9e9a7..718fdd6a26 100644 --- 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) diff --git a/ompi/mca/common/verbs/Makefile.am b/ompi/mca/common/verbs/Makefile.am index 6a01205fac..b99d8ada27 100644 --- 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) diff --git a/ompi/mca/crcp/Makefile.am b/ompi/mca/crcp/Makefile.am index f6f58c6f49..5a8eeb1ea9 100644 --- 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 diff --git a/ompi/mca/crcp/base/Makefile.am b/ompi/mca/crcp/base/Makefile.am index 54dd200aa9..fb8197b54e 100644 --- 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 diff --git a/ompi/mca/crcp/bkmrk/Makefile.am b/ompi/mca/crcp/bkmrk/Makefile.am index a858a558c7..c96af40c91 100644 --- 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 diff --git a/ompi/mca/dpm/Makefile.am b/ompi/mca/dpm/Makefile.am index 59447310f9..229519504d 100644 --- 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 diff --git a/ompi/mca/dpm/base/Makefile.am b/ompi/mca/dpm/base/Makefile.am index 76f53441b3..bba1f3105a 100644 --- 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 diff --git a/ompi/mca/dpm/orte/Makefile.am b/ompi/mca/dpm/orte/Makefile.am index 3b48bc5e4c..dd56727373 100644 --- 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__.la (for DSO builds) or libmca__.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) diff --git a/ompi/mca/fbtl/Makefile.am b/ompi/mca/fbtl/Makefile.am index 5ecef05c0f..358c4cdab4 100644 --- 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 diff --git a/ompi/mca/fbtl/posix/Makefile.am b/ompi/mca/fbtl/posix/Makefile.am index 2eb48821c6..1a27c995c6 100644 --- 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 diff --git a/ompi/mca/fbtl/pvfs2/Makefile.am b/ompi/mca/fbtl/pvfs2/Makefile.am index 14a3981e99..116dbcd0c5 100644 --- 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) diff --git a/ompi/mca/fcoll/Makefile.am b/ompi/mca/fcoll/Makefile.am index 0af2ae045e..0add37ec47 100644 --- 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 diff --git a/ompi/mca/fcoll/dynamic/Makefile.am b/ompi/mca/fcoll/dynamic/Makefile.am index 864d94df4a..ded959c98d 100644 --- 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 diff --git a/ompi/mca/fcoll/individual/Makefile.am b/ompi/mca/fcoll/individual/Makefile.am index 98cc324b66..1f976f594f 100644 --- 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 diff --git a/ompi/mca/fcoll/static/Makefile.am b/ompi/mca/fcoll/static/Makefile.am index 0934eff0b3..4b4e8f451a 100644 --- 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 diff --git a/ompi/mca/fcoll/two_phase/Makefile.am b/ompi/mca/fcoll/two_phase/Makefile.am index 869eb829cb..08003efc73 100644 --- 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 diff --git a/ompi/mca/fs/Makefile.am b/ompi/mca/fs/Makefile.am index 608888196e..862877e5d7 100644 --- 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 diff --git a/ompi/mca/fs/lustre/Makefile.am b/ompi/mca/fs/lustre/Makefile.am index 00420fceb2..00e2df67a9 100644 --- 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) diff --git a/ompi/mca/fs/pvfs2/Makefile.am b/ompi/mca/fs/pvfs2/Makefile.am index ec7d6c50b7..8423433929 100644 --- 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) diff --git a/ompi/mca/fs/ufs/Makefile.am b/ompi/mca/fs/ufs/Makefile.am index fc56912cab..3b159e08dc 100644 --- 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 diff --git a/ompi/mca/io/Makefile.am b/ompi/mca/io/Makefile.am index 0935bae078..24f7710da0 100644 --- 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 diff --git a/ompi/mca/io/ompio/Makefile.am b/ompi/mca/io/ompio/Makefile.am index f6dfaf0461..820c8b4012 100644 --- 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 diff --git a/ompi/mca/io/romio/Makefile.am b/ompi/mca/io/romio/Makefile.am index 133abbf871..6f40fbe087 100644 --- 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) diff --git a/ompi/mca/mpool/Makefile.am b/ompi/mca/mpool/Makefile.am index 49580df078..dad937de11 100644 --- 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: diff --git a/ompi/mca/mpool/base/Makefile.am b/ompi/mca/mpool/base/Makefile.am index c9f785b5ec..9df33ceb55 100644 --- 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 diff --git a/ompi/mca/mpool/gpusm/Makefile.am b/ompi/mca/mpool/gpusm/Makefile.am index 37731e7fe3..16fe111310 100644 --- 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 diff --git a/ompi/mca/mpool/grdma/Makefile.am b/ompi/mca/mpool/grdma/Makefile.am index f4b90a5fb4..7e06cdc5db 100644 --- 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 diff --git a/ompi/mca/mpool/rgpusm/Makefile.am b/ompi/mca/mpool/rgpusm/Makefile.am index 63449062b8..5003abcfa7 100644 --- 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 diff --git a/ompi/mca/mpool/sm/Makefile.am b/ompi/mca/mpool/sm/Makefile.am index 37acb9ebfd..3f93759761 100644 --- 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 diff --git a/ompi/mca/mpool/udreg/Makefile.am b/ompi/mca/mpool/udreg/Makefile.am index 4f8dc9f1a8..c93f9c1459 100644 --- 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) diff --git a/ompi/mca/mtl/Makefile.am b/ompi/mca/mtl/Makefile.am index 3261a0d174..5a9ac3fe57 100644 --- 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 diff --git a/ompi/mca/mtl/mxm/Makefile.am b/ompi/mca/mtl/mxm/Makefile.am index 2237eb6264..fae061a027 100644 --- 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) diff --git a/ompi/mca/mtl/portals4/Makefile.am b/ompi/mca/mtl/portals4/Makefile.am index d1887a7fe2..523936b646 100644 --- 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) diff --git a/ompi/mca/mtl/psm/Makefile.am b/ompi/mca/mtl/psm/Makefile.am index f911cf3591..8f7690c04b 100644 --- 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) diff --git a/ompi/mca/op/Makefile.am b/ompi/mca/op/Makefile.am index b14dec9f98..c90f533e0b 100644 --- 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 diff --git a/ompi/mca/op/base/Makefile.include b/ompi/mca/op/base/Makefile.include index 044f39eee2..65cf72f54b 100644 --- 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 \ diff --git a/ompi/mca/op/example/Makefile.am b/ompi/mca/op/example/Makefile.am index 3b309f5ec3..081e8a0e94 100644 --- 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 diff --git a/ompi/mca/op/x86/Makefile.am b/ompi/mca/op/x86/Makefile.am index ac15c7b6f8..947f09f13b 100644 --- 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 diff --git a/ompi/mca/osc/Makefile.am b/ompi/mca/osc/Makefile.am index ba6db2ba6c..5f0add5bd7 100644 --- 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 diff --git a/ompi/mca/osc/pt2pt/Makefile.am b/ompi/mca/osc/pt2pt/Makefile.am index 5b334fcd9f..a65625e343 100644 --- 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 diff --git a/ompi/mca/osc/rdma/Makefile.am b/ompi/mca/osc/rdma/Makefile.am index 3fa1de91d1..f79ed2fc78 100644 --- 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 diff --git a/ompi/mca/pml/Makefile.am b/ompi/mca/pml/Makefile.am index 19c9c09dea..ab12e345b7 100644 --- 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 diff --git a/ompi/mca/pml/bfo/Makefile.am b/ompi/mca/pml/bfo/Makefile.am index f856bc1b59..c11a8fd403 100644 --- 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 diff --git a/ompi/mca/pml/cm/Makefile.am b/ompi/mca/pml/cm/Makefile.am index a292996118..15fc85aafe 100644 --- 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) diff --git a/ompi/mca/pml/crcpw/Makefile.am b/ompi/mca/pml/crcpw/Makefile.am index f76632bb9f..381c37fd35 100644 --- 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 diff --git a/ompi/mca/pml/example/Makefile.am b/ompi/mca/pml/example/Makefile.am index c2ff08988c..ee7868ae2a 100644 --- 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 diff --git a/ompi/mca/pml/ob1/Makefile.am b/ompi/mca/pml/ob1/Makefile.am index eb6bd3dda4..2016c77e97 100644 --- 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 diff --git a/ompi/mca/pml/v/Makefile.am b/ompi/mca/pml/v/Makefile.am index 098beddecf..3eac8182dc 100644 --- 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 diff --git a/ompi/mca/pubsub/Makefile.am b/ompi/mca/pubsub/Makefile.am index 8c8f08c8af..0ad7b4a83d 100644 --- 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 diff --git a/ompi/mca/pubsub/orte/Makefile.am b/ompi/mca/pubsub/orte/Makefile.am index 7f27c6fa4b..3b976a7ec5 100644 --- 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__.la (for DSO builds) or libmca__.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) diff --git a/ompi/mca/pubsub/pmi/Makefile.am b/ompi/mca/pubsub/pmi/Makefile.am index 9a3d3d7b15..234fb940e1 100644 --- 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) diff --git a/ompi/mca/rcache/Makefile.am b/ompi/mca/rcache/Makefile.am index ce23ab7d29..be2f8e02da 100644 --- 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 diff --git a/ompi/mca/rcache/vma/Makefile.am b/ompi/mca/rcache/vma/Makefile.am index 7bdd02a9fa..cb10b4b5d6 100644 --- 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) diff --git a/ompi/mca/rte/Makefile.am b/ompi/mca/rte/Makefile.am index de9d949e99..7d45593426 100644 --- a/ompi/mca/rte/Makefile.am +++ b/ompi/mca/rte/Makefile.am @@ -17,7 +17,7 @@ libmca_rte_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/$(subdir) +ompidir = $(ompiincludedir)/$(subdir) nobase_ompi_HEADERS = $(headers) endif diff --git a/ompi/mca/rte/orte/Makefile.am b/ompi/mca/rte/orte/Makefile.am index e79ca669c1..5d8a48f3f1 100644 --- a/ompi/mca/rte/orte/Makefile.am +++ b/ompi/mca/rte/orte/Makefile.am @@ -16,7 +16,7 @@ sources = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/$(subdir) +ompidir = $(ompiincludedir)/$(subdir) nobase_ompi_HEADERS = $(headers) endif diff --git a/ompi/mca/rte/pmi/Makefile.am b/ompi/mca/rte/pmi/Makefile.am index 86f293086f..993def37ec 100644 --- a/ompi/mca/rte/pmi/Makefile.am +++ b/ompi/mca/rte/pmi/Makefile.am @@ -31,7 +31,7 @@ local_sources = \ rte_pmi_db.c \ rte_pmi_comm.c -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rte_pmi_la_SOURCES = $(local_sources) mca_rte_pmi_la_LDFLAGS = -module -avoid-version $(rte_pmi_LDFLAGS) diff --git a/ompi/mca/sbgp/Makefile.am b/ompi/mca/sbgp/Makefile.am index 3590f3c06b..6e62a802e9 100644 --- a/ompi/mca/sbgp/Makefile.am +++ b/ompi/mca/sbgp/Makefile.am @@ -25,7 +25,7 @@ libmca_sbgp_la_SOURCES += $(headers) $(nodist_headers) if WANT_INSTALL_HEADERS nobase_ompi_HEADERS += $(headers) nobase_nodist_ompi_HEADERS += $(nodist_headers) -ompidir = $(includedir)/openmpi/ompi/mca/sbgp +ompidir = $(ompiincludedir)/ompi/mca/sbgp else ompidir = $(includedir) endif diff --git a/ompi/mca/sbgp/basesmsocket/Makefile.am b/ompi/mca/sbgp/basesmsocket/Makefile.am index 8dd597fd8f..06f6540f26 100644 --- a/ompi/mca/sbgp/basesmsocket/Makefile.am +++ b/ompi/mca/sbgp/basesmsocket/Makefile.am @@ -30,7 +30,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_sbgp_basesmsocket_la_SOURCES = $(sources) mca_sbgp_basesmsocket_la_LDFLAGS = -module -avoid-version diff --git a/ompi/mca/sbgp/basesmuma/Makefile.am b/ompi/mca/sbgp/basesmuma/Makefile.am index 583e1e6e86..e08c5b42e3 100644 --- a/ompi/mca/sbgp/basesmuma/Makefile.am +++ b/ompi/mca/sbgp/basesmuma/Makefile.am @@ -30,7 +30,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_sbgp_basesmuma_la_SOURCES = $(sources) mca_sbgp_basesmuma_la_LDFLAGS = -module -avoid-version diff --git a/ompi/mca/sbgp/ibnet/Makefile.am b/ompi/mca/sbgp/ibnet/Makefile.am index b82f5f9eac..3abfea381d 100644 --- a/ompi/mca/sbgp/ibnet/Makefile.am +++ b/ompi/mca/sbgp/ibnet/Makefile.am @@ -36,7 +36,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_sbgp_ibnet_la_SOURCES = $(sources) mca_sbgp_ibnet_la_LDFLAGS = -module -avoid-version $(sbgp_ibnet_LDFLAGS) $(btl_openib_LDFLAGS) diff --git a/ompi/mca/sbgp/p2p/Makefile.am b/ompi/mca/sbgp/p2p/Makefile.am index 1ed9830a92..9f36460af8 100644 --- a/ompi/mca/sbgp/p2p/Makefile.am +++ b/ompi/mca/sbgp/p2p/Makefile.am @@ -30,7 +30,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_sbgp_p2p_la_SOURCES = $(sources) mca_sbgp_p2p_la_LDFLAGS = -module -avoid-version diff --git a/ompi/mca/sharedfp/Makefile.am b/ompi/mca/sharedfp/Makefile.am index 011b8037db..00ff8d39c4 100644 --- a/ompi/mca/sharedfp/Makefile.am +++ b/ompi/mca/sharedfp/Makefile.am @@ -30,7 +30,7 @@ libmca_sharedfp_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/$(subdir) +ompidir = $(ompiincludedir)/$(subdir) nobase_ompi_HEADERS = $(headers) endif diff --git a/ompi/mca/sharedfp/addproc/Makefile.am b/ompi/mca/sharedfp/addproc/Makefile.am index 182ef1a372..ba5eab9eb9 100644 --- a/ompi/mca/sharedfp/addproc/Makefile.am +++ b/ompi/mca/sharedfp/addproc/Makefile.am @@ -29,7 +29,7 @@ component_noinst = libmca_sharedfp_addproc.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_sharedfp_addproc_la_SOURCES = $(sources) mca_sharedfp_addproc_la_LDFLAGS = -module -avoid-version diff --git a/ompi/mca/sharedfp/individual/Makefile.am b/ompi/mca/sharedfp/individual/Makefile.am index 33fa26ab7d..dbe77ef914 100644 --- a/ompi/mca/sharedfp/individual/Makefile.am +++ b/ompi/mca/sharedfp/individual/Makefile.am @@ -29,7 +29,7 @@ component_noinst = libmca_sharedfp_individual.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_sharedfp_individual_la_SOURCES = $(sources) mca_sharedfp_individual_la_LDFLAGS = -module -avoid-version diff --git a/ompi/mca/sharedfp/lockedfile/Makefile.am b/ompi/mca/sharedfp/lockedfile/Makefile.am index a072955582..5b7d6ac219 100644 --- a/ompi/mca/sharedfp/lockedfile/Makefile.am +++ b/ompi/mca/sharedfp/lockedfile/Makefile.am @@ -29,7 +29,7 @@ component_noinst = libmca_sharedfp_lockedfile.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_sharedfp_lockedfile_la_SOURCES = $(sources) mca_sharedfp_lockedfile_la_LDFLAGS = -module -avoid-version diff --git a/ompi/mca/sharedfp/sm/Makefile.am b/ompi/mca/sharedfp/sm/Makefile.am index 470c3c0112..8c5d21a9b5 100644 --- a/ompi/mca/sharedfp/sm/Makefile.am +++ b/ompi/mca/sharedfp/sm/Makefile.am @@ -29,7 +29,7 @@ component_noinst = libmca_sharedfp_sm.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_sharedfp_sm_la_SOURCES = $(sources) mca_sharedfp_sm_la_LDFLAGS = -module -avoid-version diff --git a/ompi/mca/topo/Makefile.am b/ompi/mca/topo/Makefile.am index 213323b6da..351495346c 100644 --- a/ompi/mca/topo/Makefile.am +++ b/ompi/mca/topo/Makefile.am @@ -29,7 +29,7 @@ libmca_topo_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/$(subdir) +ompidir = $(ompiincludedir)/$(subdir) nobase_ompi_HEADERS = $(headers) endif diff --git a/ompi/mca/topo/basic/Makefile.am b/ompi/mca/topo/basic/Makefile.am index ebfc5731b9..75693d9fa6 100644 --- a/ompi/mca/topo/basic/Makefile.am +++ b/ompi/mca/topo/basic/Makefile.am @@ -33,7 +33,7 @@ component = component_sources = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component) mca_topo_basic_la_SOURCES = $(component_sources) mca_topo_basic_la_LDFLAGS = -module -avoid-version diff --git a/ompi/mca/vprotocol/Makefile.am b/ompi/mca/vprotocol/Makefile.am index 949530563c..fe3e2c3235 100644 --- a/ompi/mca/vprotocol/Makefile.am +++ b/ompi/mca/vprotocol/Makefile.am @@ -20,7 +20,7 @@ libmca_vprotocol_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 diff --git a/ompi/mca/vprotocol/example/Makefile.am b/ompi/mca/vprotocol/example/Makefile.am index 79af37c893..792904559e 100644 --- a/ompi/mca/vprotocol/example/Makefile.am +++ b/ompi/mca/vprotocol/example/Makefile.am @@ -33,7 +33,7 @@ local_sources = \ vprotocol_example_probe.c \ vprotocol_example_wait.h \ vprotocol_example_wait.c -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_vprotocol_example_la_SOURCES = $(local_sources) mca_vprotocol_example_la_LIBADD = diff --git a/ompi/mca/vprotocol/pessimist/Makefile.am b/ompi/mca/vprotocol/pessimist/Makefile.am index 13ecd5efe0..ec6e8d6e56 100644 --- a/ompi/mca/vprotocol/pessimist/Makefile.am +++ b/ompi/mca/vprotocol/pessimist/Makefile.am @@ -45,7 +45,7 @@ component_noinst = libmca_vprotocol_pessimist.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_vprotocol_pessimist_la_SOURCES = $(local_sources) mca_vprotocol_pessimist_la_LDFLAGS = -module -avoid-version diff --git a/ompi/mpi/Makefile.am b/ompi/mpi/Makefile.am index 80e3401986..87e9af8e99 100644 --- a/ompi/mpi/Makefile.am +++ b/ompi/mpi/Makefile.am @@ -20,4 +20,4 @@ EXTRA_DIST = \ mpi/fortran/configure-fortran-output-bottom.h -dist_pkgdata_DATA += mpi/help-mpi-api.txt +dist_ompidata_DATA += mpi/help-mpi-api.txt diff --git a/ompi/mpi/c/Makefile.am b/ompi/mpi/c/Makefile.am index cd63a7b5d2..9ddceb4140 100644 --- a/ompi/mpi/c/Makefile.am +++ b/ompi/mpi/c/Makefile.am @@ -426,6 +426,6 @@ endif # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/$(subdir) +ompidir = $(ompiincludedir)/$(subdir) ompi_HEADERS = $(headers) endif diff --git a/ompi/mpi/c/profile/Makefile.am b/ompi/mpi/c/profile/Makefile.am index b70666b76b..a2e2ff8845 100644 --- a/ompi/mpi/c/profile/Makefile.am +++ b/ompi/mpi/c/profile/Makefile.am @@ -417,7 +417,7 @@ $(nodist_libmpi_c_pmpi_la_SOURCES): # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/$(subdir) +ompidir = $(ompiincludedir)/$(subdir) ompi_HEADERS = $(headers) endif diff --git a/ompi/mpi/cxx/Makefile.am b/ompi/mpi/cxx/Makefile.am index b003f7105e..fec0d2aafb 100644 --- a/ompi/mpi/cxx/Makefile.am +++ b/ompi/mpi/cxx/Makefile.am @@ -78,7 +78,7 @@ headers = \ errhandler_inln.h \ status_inln.h -ompidir = $(includedir)/openmpi/ompi/mpi/cxx +ompidir = $(ompiincludedir)/ompi/mpi/cxx ompi_HEADERS = \ $(headers) endif diff --git a/ompi/mpi/fortran/mpif-h/Makefile.am b/ompi/mpi/fortran/mpif-h/Makefile.am index 7b15701679..fea13ecfed 100644 --- a/ompi/mpi/fortran/mpif-h/Makefile.am +++ b/ompi/mpi/fortran/mpif-h/Makefile.am @@ -423,6 +423,6 @@ endif # if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/$(subdir) +ompidir = $(ompiincludedir)/$(subdir) ompi_HEADERS = $(headers) endif diff --git a/ompi/mpi/fortran/mpif-h/profile/Makefile.am b/ompi/mpi/fortran/mpif-h/profile/Makefile.am index a465fd243a..1c59a966f7 100644 --- a/ompi/mpi/fortran/mpif-h/profile/Makefile.am +++ b/ompi/mpi/fortran/mpif-h/profile/Makefile.am @@ -399,7 +399,7 @@ $(nodist_libmpi_mpifh_pmpi_la_SOURCES): # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/$(subdir) +ompidir = $(ompiincludedir)/$(subdir) ompi_HEADERS = $(headers) endif diff --git a/ompi/mpi/java/c/Makefile.am b/ompi/mpi/java/c/Makefile.am index f101cb6c01..6b90e27e30 100644 --- a/ompi/mpi/java/c/Makefile.am +++ b/ompi/mpi/java/c/Makefile.am @@ -16,7 +16,7 @@ AM_CPPFLAGS = -I$(top_builddir)/ompi/mpi/java/java $(OPAL_JDK_CPPFLAGS) -DOPAL_D headers = \ mpiJava.h -ompidir = $(includedir)/openmpi/ompi/mpi/java +ompidir = $(ompiincludedir)/ompi/mpi/java ompi_HEADERS = \ $(headers) diff --git a/ompi/mpi/java/java/Makefile.am b/ompi/mpi/java/java/Makefile.am index d28ab296a5..10597d8d13 100644 --- a/ompi/mpi/java/java/Makefile.am +++ b/ompi/mpi/java/java/Makefile.am @@ -160,7 +160,7 @@ CLEANFILES += -rf mpi/* $(JAVA_H) doc # Conditionally install the header files if WANT_INSTALL_HEADERS -ompihdir = $(includedir)/openmpi/$(subdir) +ompihdir = $(ompiincludedir)/$(subdir) nobase_nodist_ompih_HEADERS = $(JAVA_H) endif diff --git a/ompi/mpi/tool/Makefile.am b/ompi/mpi/tool/Makefile.am index 2fa893f7e1..79b50f5002 100644 --- a/ompi/mpi/tool/Makefile.am +++ b/ompi/mpi/tool/Makefile.am @@ -42,6 +42,6 @@ libmpi_mpit_la_SOURCES = init_thread.c finalize.c cvar_get_num.c \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/$(subdir) +ompidir = $(ompiincludedir)/$(subdir) ompi_HEADERS = $(headers) endif diff --git a/ompi/mpi/tool/profile/Makefile.am b/ompi/mpi/tool/profile/Makefile.am index bb3b524b2c..ff2957cf43 100644 --- a/ompi/mpi/tool/profile/Makefile.am +++ b/ompi/mpi/tool/profile/Makefile.am @@ -85,7 +85,7 @@ $(nodist_libmpi_pmpit_la_SOURCES): # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/$(subdir) +ompidir = $(ompiincludedir)/$(subdir) ompi_HEADERS = $(headers) endif diff --git a/ompi/mpiext/affinity/c/Makefile.am b/ompi/mpiext/affinity/c/Makefile.am index 7d156d8c51..49081f2fdb 100644 --- a/ompi/mpiext/affinity/c/Makefile.am +++ b/ompi/mpiext/affinity/c/Makefile.am @@ -30,7 +30,7 @@ noinst_LTLIBRARIES = libmpiext_affinity_c.la # This is where the top-level header file (that is included in # ) must be installed. -ompidir = $(includedir)/openmpi/ompi/mpiext/affinity/c +ompidir = $(ompiincludedir)/ompi/mpiext/affinity/c # This is the header file that is installed. ompi_HEADERS = mpiext_affinity_c.h diff --git a/ompi/mpiext/cr/c/Makefile.am b/ompi/mpiext/cr/c/Makefile.am index 0c75a0ff7d..f2667667f8 100644 --- a/ompi/mpiext/cr/c/Makefile.am +++ b/ompi/mpiext/cr/c/Makefile.am @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libmpiext_cr_c.la # This is where the top-level header file (that is included in # ) must be installed. -ompidir = $(includedir)/openmpi/ompi/mpiext/cr/c +ompidir = $(ompiincludedir)/ompi/mpiext/cr/c # This is the header file that is installed. ompi_HEADERS = mpiext_cr_c.h diff --git a/ompi/mpiext/example/c/Makefile.am b/ompi/mpiext/example/c/Makefile.am index 6ec992af20..088ab79877 100644 --- a/ompi/mpiext/example/c/Makefile.am +++ b/ompi/mpiext/example/c/Makefile.am @@ -23,7 +23,7 @@ noinst_LTLIBRARIES = libmpiext_example_c.la # This is where the top-level header file (that is included in # ) must be installed. -ompidir = $(includedir)/openmpi/ompi/mpiext/example/c +ompidir = $(ompiincludedir)/ompi/mpiext/example/c # This is the header file that is installed. ompi_HEADERS = mpiext_example_c.h diff --git a/ompi/mpiext/example/mpif-h/Makefile.am b/ompi/mpiext/example/mpif-h/Makefile.am index c22b5225a5..004bae0407 100644 --- a/ompi/mpiext/example/mpif-h/Makefile.am +++ b/ompi/mpiext/example/mpif-h/Makefile.am @@ -26,7 +26,7 @@ noinst_LTLIBRARIES = # Directory where the header file to be included in mpif-ext.h must be # installed. -ompidir = $(includedir)/openmpi/ompi/mpiext/example/mpif-h +ompidir = $(ompiincludedir)/ompi/mpiext/example/mpif-h # Just like noinst_LTLIBRARIES, set this macro to empty and # conditionally add to it later. diff --git a/ompi/runtime/Makefile.am b/ompi/runtime/Makefile.am index 3129752255..a6625fb892 100644 --- a/ompi/runtime/Makefile.am +++ b/ompi/runtime/Makefile.am @@ -19,7 +19,7 @@ # This makefile.am does not stand on its own - it is included from ompi/Makefile.am -dist_pkgdata_DATA += runtime/help-mpi-runtime.txt +dist_ompidata_DATA += runtime/help-mpi-runtime.txt headers += \ runtime/mpiruntime.h \ diff --git a/ompi/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am index e1553e5d38..27e3421cd7 100644 --- a/ompi/tools/wrappers/Makefile.am +++ b/ompi/tools/wrappers/Makefile.am @@ -81,7 +81,7 @@ endif man_MANS = $(man_pages) -nodist_pkgdata_DATA = \ +nodist_ompidata_DATA = \ mpicc-wrapper-data.txt \ mpic++-wrapper-data.txt \ mpifort-wrapper-data.txt diff --git a/opal/Makefile.am b/opal/Makefile.am index 900f5cc71b..0aaf841cc7 100644 --- a/opal/Makefile.am +++ b/opal/Makefile.am @@ -61,13 +61,13 @@ libopen_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version) # included subdirectory Makefile.am's and appended-to variables headers = noinst_LTLIBRARIES = -dist_pkgdata_DATA = +dist_ompidata_DATA = libopen_pal_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) # This is somewhat of a hack -- libltdl is installed by libtoolize, diff --git a/opal/datatype/Makefile.am b/opal/datatype/Makefile.am index f07ac78f13..5f97a590f7 100644 --- a/opal/datatype/Makefile.am +++ b/opal/datatype/Makefile.am @@ -69,7 +69,7 @@ libdatatype_la_LIBADD = libdatatype_reliable.la # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) opal_HEADERS = $(headers) endif diff --git a/opal/include/Makefile.am b/opal/include/Makefile.am index 3a5b1f6f33..b2e5da16b5 100644 --- a/opal/include/Makefile.am +++ b/opal/include/Makefile.am @@ -29,7 +29,7 @@ include opal/Makefile.am EXTRA_DIST = $(headers) if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi +opaldir = $(ompiincludedir) nobase_dist_opal_HEADERS = $(headers) nobase_nodist_opal_HEADERS = $(nodist_headers) endif diff --git a/opal/mca/backtrace/Makefile.am b/opal/mca/backtrace/Makefile.am index 9f9c9f11be..4d6c73c43d 100644 --- a/opal/mca/backtrace/Makefile.am +++ b/opal/mca/backtrace/Makefile.am @@ -27,7 +27,7 @@ libmca_backtrace_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/base/Makefile.am b/opal/mca/base/Makefile.am index dfdc795601..dde21328f4 100644 --- a/opal/mca/base/Makefile.am +++ b/opal/mca/base/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libmca_base.la -dist_pkgdata_DATA = help-mca-base.txt help-mca-var.txt +dist_ompidata_DATA = help-mca-base.txt help-mca-var.txt # Source code files @@ -64,6 +64,6 @@ libmca_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) opal_HEADERS = $(headers) endif diff --git a/opal/mca/compress/Makefile.am b/opal/mca/compress/Makefile.am index 709c98eb4f..f04f89e599 100644 --- a/opal/mca/compress/Makefile.am +++ b/opal/mca/compress/Makefile.am @@ -27,7 +27,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/compress/base/Makefile.am b/opal/mca/compress/base/Makefile.am index bfada1c711..984195399a 100644 --- a/opal/mca/compress/base/Makefile.am +++ b/opal/mca/compress/base/Makefile.am @@ -9,7 +9,7 @@ # $HEADER$ # -dist_pkgdata_DATA = base/help-opal-compress-base.txt +dist_ompidata_DATA = base/help-opal-compress-base.txt headers += \ base/base.h diff --git a/opal/mca/compress/bzip/Makefile.am b/opal/mca/compress/bzip/Makefile.am index bde2ec3c8f..831c2f45ef 100644 --- a/opal/mca/compress/bzip/Makefile.am +++ b/opal/mca/compress/bzip/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ $(LTDLINCL) -dist_pkgdata_DATA = help-opal-compress-bzip.txt +dist_ompidata_DATA = help-opal-compress-bzip.txt sources = \ compress_bzip.h \ @@ -30,7 +30,7 @@ component_noinst = libmca_compress_bzip.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_compress_bzip_la_SOURCES = $(sources) mca_compress_bzip_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/compress/gzip/Makefile.am b/opal/mca/compress/gzip/Makefile.am index 072e83878f..9119d59bf1 100644 --- a/opal/mca/compress/gzip/Makefile.am +++ b/opal/mca/compress/gzip/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ $(LTDLINCL) -dist_pkgdata_DATA = help-opal-compress-gzip.txt +dist_ompidata_DATA = help-opal-compress-gzip.txt sources = \ compress_gzip.h \ @@ -30,7 +30,7 @@ component_noinst = libmca_compress_gzip.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_compress_gzip_la_SOURCES = $(sources) mca_compress_gzip_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/crs/Makefile.am b/opal/mca/crs/Makefile.am index 0d6630349d..89be074128 100644 --- a/opal/mca/crs/Makefile.am +++ b/opal/mca/crs/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 -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/crs/base/Makefile.am b/opal/mca/crs/base/Makefile.am index 7f545dac88..0d57c8b62d 100644 --- a/opal/mca/crs/base/Makefile.am +++ b/opal/mca/crs/base/Makefile.am @@ -16,7 +16,7 @@ # $HEADER$ # -dist_pkgdata_DATA = base/help-opal-crs-base.txt +dist_ompidata_DATA = base/help-opal-crs-base.txt headers += \ base/base.h diff --git a/opal/mca/crs/blcr/Makefile.am b/opal/mca/crs/blcr/Makefile.am index 3ec7ec4640..18c8aae057 100644 --- a/opal/mca/crs/blcr/Makefile.am +++ b/opal/mca/crs/blcr/Makefile.am @@ -18,7 +18,7 @@ CFLAGS = $(crs_blcr_CFLAGS) AM_CPPFLAGS = $(crs_blcr_CPPFLAGS) -dist_pkgdata_DATA = help-opal-crs-blcr.txt +dist_ompidata_DATA = help-opal-crs-blcr.txt sources = \ crs_blcr.h \ @@ -37,7 +37,7 @@ component_noinst = libmca_crs_blcr.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_crs_blcr_la_SOURCES = $(sources) mca_crs_blcr_la_LDFLAGS = -module -avoid-version $(crs_blcr_LDFLAGS) diff --git a/opal/mca/crs/dmtcp/Makefile.am b/opal/mca/crs/dmtcp/Makefile.am index 8997eab5e4..24f9f291d1 100644 --- a/opal/mca/crs/dmtcp/Makefile.am +++ b/opal/mca/crs/dmtcp/Makefile.am @@ -11,7 +11,7 @@ CFLAGS = $(crs_dmtcp_CFLAGS) AM_CPPFLAGS = $(crs_dmtcp_CPPFLAGS) -dist_pkgdata_DATA = help-opal-crs-dmtcp.txt +dist_ompidata_DATA = help-opal-crs-dmtcp.txt sources = \ crs_dmtcp.h \ @@ -30,7 +30,7 @@ component_noinst = libmca_crs_dmtcp.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_crs_dmtcp_la_SOURCES = $(sources) mca_crs_dmtcp_la_LDFLAGS = -module -avoid-version $(crs_dmtcp_LDFLAGS) diff --git a/opal/mca/crs/none/Makefile.am b/opal/mca/crs/none/Makefile.am index 04f109e0df..49467ce9b2 100644 --- a/opal/mca/crs/none/Makefile.am +++ b/opal/mca/crs/none/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS = \ $(LTDLINCL) -dist_pkgdata_DATA = help-opal-crs-none.txt +dist_ompidata_DATA = help-opal-crs-none.txt sources = \ crs_none.h \ @@ -33,7 +33,7 @@ component_noinst = libmca_crs_none.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_crs_none_la_SOURCES = $(sources) mca_crs_none_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/crs/self/Makefile.am b/opal/mca/crs/self/Makefile.am index 7407860e59..bf23c19db6 100644 --- a/opal/mca/crs/self/Makefile.am +++ b/opal/mca/crs/self/Makefile.am @@ -18,7 +18,7 @@ AM_CPPFLAGS = \ $(LTDLINCL) -dist_pkgdata_DATA = help-opal-crs-self.txt +dist_ompidata_DATA = help-opal-crs-self.txt sources = \ crs_self.h \ @@ -37,7 +37,7 @@ component_noinst = libmca_crs_self.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_crs_self_la_SOURCES = $(sources) mca_crs_self_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/db/Makefile.am b/opal/mca/db/Makefile.am index bef643a328..ad5055abbd 100644 --- a/opal/mca/db/Makefile.am +++ b/opal/mca/db/Makefile.am @@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libmca_db.la libmca_db_la_SOURCES = # pkgdata setup -dist_pkgdata_DATA = +dist_ompidata_DATA = # local files headers = db.h db_types.h @@ -22,7 +22,7 @@ libmca_db_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/db/base/Makefile.am b/opal/mca/db/base/Makefile.am index 09cc5e089a..2fe4be1dcc 100644 --- a/opal/mca/db/base/Makefile.am +++ b/opal/mca/db/base/Makefile.am @@ -8,7 +8,7 @@ # $HEADER$ # -dist_pkgdata_DATA += base/help-db-base.txt +dist_ompidata_DATA += base/help-db-base.txt headers += \ base/base.h diff --git a/opal/mca/db/hash/Makefile.am b/opal/mca/db/hash/Makefile.am index da73b7ddba..38754834f1 100644 --- a/opal/mca/db/hash/Makefile.am +++ b/opal/mca/db/hash/Makefile.am @@ -25,7 +25,7 @@ component_noinst = libmca_db_hash.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_db_hash_la_SOURCES = $(sources) mca_db_hash_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/db/pmi/Makefile.am b/opal/mca/db/pmi/Makefile.am index 2092be2651..468a43d7ac 100644 --- a/opal/mca/db/pmi/Makefile.am +++ b/opal/mca/db/pmi/Makefile.am @@ -24,7 +24,7 @@ component_noinst = libmca_db_pmi.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_db_pmi_la_SOURCES = $(sources) mca_db_pmi_la_CPPFLAGS = $(db_pmi_CPPFLAGS) diff --git a/opal/mca/db/print/Makefile.am b/opal/mca/db/print/Makefile.am index 583aa30b00..a4a832ee3b 100644 --- a/opal/mca/db/print/Makefile.am +++ b/opal/mca/db/print/Makefile.am @@ -24,7 +24,7 @@ component_noinst = libmca_db_print.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_db_print_la_CPPFLAGS = $(db_print_CPPFLAGS) mca_db_print_la_SOURCES = $(sources) diff --git a/opal/mca/db/sqlite/Makefile.am b/opal/mca/db/sqlite/Makefile.am index 86f09fd11b..1a9e33c148 100644 --- a/opal/mca/db/sqlite/Makefile.am +++ b/opal/mca/db/sqlite/Makefile.am @@ -7,7 +7,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-db-sqlite.txt +dist_ompidata_DATA = help-db-sqlite.txt sources = \ db_sqlite.h \ @@ -26,7 +26,7 @@ component_noinst = libmca_db_sqlite.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_db_sqlite_la_CPPFLAGS = $(db_sqlite_CPPFLAGS) mca_db_sqlite_la_SOURCES = $(sources) diff --git a/opal/mca/event/Makefile.am b/opal/mca/event/Makefile.am index 49b3ff9e72..8c4b32ba1f 100644 --- a/opal/mca/event/Makefile.am +++ b/opal/mca/event/Makefile.am @@ -17,7 +17,7 @@ libmca_event_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/event/libevent2021/Makefile.am b/opal/mca/event/libevent2021/Makefile.am index 892118b29c..a9161ddf00 100644 --- a/opal/mca/event/libevent2021/Makefile.am +++ b/opal/mca/event/libevent2021/Makefile.am @@ -61,7 +61,7 @@ headers += libevent/opal_rename.h libevent/event.h libevent/evutil.h libevent/ut libevent/include/event2/tag.h \ libevent/include/event2/thread.h \ libevent/include/event2/util.h -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) nobase_nodist_opal_HEADERS = libevent/include/event2/event-config.h diff --git a/opal/mca/hwloc/Makefile.am b/opal/mca/hwloc/Makefile.am index 6c393ac159..f96c9f2438 100644 --- a/opal/mca/hwloc/Makefile.am +++ b/opal/mca/hwloc/Makefile.am @@ -17,7 +17,7 @@ libmca_hwloc_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/hwloc/base/Makefile.am b/opal/mca/hwloc/base/Makefile.am index 38db09052a..74cb2ec917 100644 --- a/opal/mca/hwloc/base/Makefile.am +++ b/opal/mca/hwloc/base/Makefile.am @@ -7,7 +7,7 @@ # $HEADER$ # -dist_pkgdata_DATA = base/help-opal-hwloc-base.txt +dist_ompidata_DATA = base/help-opal-hwloc-base.txt headers += \ base/base.h diff --git a/opal/mca/hwloc/hwloc172/Makefile.am b/opal/mca/hwloc/hwloc172/Makefile.am index 56974ab2e5..6c38957ce7 100644 --- a/opal/mca/hwloc/hwloc172/Makefile.am +++ b/opal/mca/hwloc/hwloc172/Makefile.am @@ -61,7 +61,7 @@ endif HWLOC_HAVE_SCHED_SETAFFINITY # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) nobase_nodist_opal_HEADERS = $(nodist_headers) endif diff --git a/opal/mca/hwloc/hwloc172/hwloc/Makefile.am b/opal/mca/hwloc/hwloc172/hwloc/Makefile.am index a76d42e489..57a18a7e13 100644 --- a/opal/mca/hwloc/hwloc172/hwloc/Makefile.am +++ b/opal/mca/hwloc/hwloc172/hwloc/Makefile.am @@ -29,7 +29,7 @@ endif # Only install the valgrind suppressions file if we're building in standalone mode if HWLOC_BUILD_STANDALONE -dist_pkgdata_DATA = contrib/hwloc-valgrind.supp +dist_ompidata_DATA = contrib/hwloc-valgrind.supp endif # diff --git a/opal/mca/if/Makefile.am b/opal/mca/if/Makefile.am index ee651a72fc..e582e90451 100644 --- a/opal/mca/if/Makefile.am +++ b/opal/mca/if/Makefile.am @@ -17,7 +17,7 @@ libmca_if_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/opal/mca/if +opaldir = $(ompiincludedir)/opal/mca/if nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/installdirs/Makefile.am b/opal/mca/installdirs/Makefile.am index a3321260cc..236e344752 100644 --- a/opal/mca/installdirs/Makefile.am +++ b/opal/mca/installdirs/Makefile.am @@ -19,7 +19,7 @@ libmca_installdirs_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/installdirs/config/install_dirs.h.in b/opal/mca/installdirs/config/install_dirs.h.in index 03c8d13012..370bf6661f 100644 --- a/opal/mca/installdirs/config/install_dirs.h.in +++ b/opal/mca/installdirs/config/install_dirs.h.in @@ -76,7 +76,7 @@ /* $(datadir)/package-name/. You probably want to use this instead of OPAL_DATADIR */ -#define OPAL_PKGDATADIR "${datadir}/@PACKAGE@" +#define OPAL_PKGDATADIR "@ompidatadir@" /* The directory for installing read-only data files that pertain to a single machine–that is to say, files for configuring a host. Mailer @@ -109,14 +109,14 @@ #define OPAL_LIBDIR "@libdir@" /* $(libdir)/package-name/. This is where components should go */ -#define OPAL_PKGLIBDIR "${libdir}/@PACKAGE@" +#define OPAL_PKGLIBDIR "@ompilibdir@" /* The directory for installing header files to be included by user programs with the C ‘#include’ preprocessor directive. */ #define OPAL_INCLUDEDIR "@includedir@" /* $(includedir)/package-name/. The devel headers go in here */ -#define OPAL_PKGINCLUDEDIR "${includedir}/@PACKAGE@" +#define OPAL_PKGINCLUDEDIR "@ompiincludedir@" /* The directory for installing the Info files for this package. */ #define OPAL_INFODIR "@infodir@" diff --git a/opal/mca/memchecker/Makefile.am b/opal/mca/memchecker/Makefile.am index cdeed9b595..dab3fe9ac6 100644 --- a/opal/mca/memchecker/Makefile.am +++ b/opal/mca/memchecker/Makefile.am @@ -19,7 +19,7 @@ libmca_memchecker_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/memcpy/Makefile.am b/opal/mca/memcpy/Makefile.am index 382cb5f07d..99e3b34b59 100644 --- a/opal/mca/memcpy/Makefile.am +++ b/opal/mca/memcpy/Makefile.am @@ -21,7 +21,7 @@ libmca_memcpy_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) nobase_nodist_opal_HEADERS = $(nodist_headers) endif diff --git a/opal/mca/memory/Makefile.am b/opal/mca/memory/Makefile.am index d56da9ce9b..9bab853b72 100644 --- a/opal/mca/memory/Makefile.am +++ b/opal/mca/memory/Makefile.am @@ -27,7 +27,7 @@ libmca_memory_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/memory/linux/Makefile.am b/opal/mca/memory/linux/Makefile.am index 31bdb3da28..4fec365880 100644 --- a/opal/mca/memory/linux/Makefile.am +++ b/opal/mca/memory/linux/Makefile.am @@ -32,11 +32,11 @@ AM_CPPFLAGS += -I$(srcdir)/sysdeps/generic # software. So install it in the same place that we install ROMIO's # copyright notices. -docdir = $(datadir)/openmpi/doc +docdir = $(ompidatadir)/doc doc_DATA = COPYRIGHT-ptmalloc2.txt # Help file -dist_pkgdata_DATA = help-opal-memory-linux.txt +dist_ompidata_DATA = help-opal-memory-linux.txt # This component is only ever built statically (i.e., slurped into # libopen-pal) -- it is never built as a DSO. diff --git a/opal/mca/pstat/Makefile.am b/opal/mca/pstat/Makefile.am index 0a6b9c792f..4ba8206109 100644 --- a/opal/mca/pstat/Makefile.am +++ b/opal/mca/pstat/Makefile.am @@ -27,7 +27,7 @@ libmca_pstat_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/pstat/linux/Makefile.am b/opal/mca/pstat/linux/Makefile.am index 259c25a0da..08a08dacaf 100644 --- a/opal/mca/pstat/linux/Makefile.am +++ b/opal/mca/pstat/linux/Makefile.am @@ -34,7 +34,7 @@ component_noinst = libmca_pstat_linux.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_pstat_linux_la_SOURCES = $(sources) mca_pstat_linux_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/pstat/test/Makefile.am b/opal/mca/pstat/test/Makefile.am index 760bbc55b6..3be1952cbc 100644 --- a/opal/mca/pstat/test/Makefile.am +++ b/opal/mca/pstat/test/Makefile.am @@ -34,7 +34,7 @@ component_noinst = libmca_pstat_test.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_pstat_test_la_SOURCES = $(sources) mca_pstat_test_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/shmem/Makefile.am b/opal/mca/shmem/Makefile.am index 0006822373..e120ce82db 100644 --- a/opal/mca/shmem/Makefile.am +++ b/opal/mca/shmem/Makefile.am @@ -29,7 +29,7 @@ libmca_shmem_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/shmem/mmap/Makefile.am b/opal/mca/shmem/mmap/Makefile.am index 7cf84af2da..7a6a17df2f 100644 --- a/opal/mca/shmem/mmap/Makefile.am +++ b/opal/mca/shmem/mmap/Makefile.am @@ -37,9 +37,9 @@ component_install = endif # help file -dist_pkgdata_DATA = help-opal-shmem-mmap.txt +dist_ompidata_DATA = help-opal-shmem-mmap.txt -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_shmem_mmap_la_SOURCES = $(sources) mca_shmem_mmap_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/shmem/posix/Makefile.am b/opal/mca/shmem/posix/Makefile.am index 77c162c353..4039df5aba 100644 --- a/opal/mca/shmem/posix/Makefile.am +++ b/opal/mca/shmem/posix/Makefile.am @@ -37,7 +37,7 @@ component_noinst = libmca_shmem_posix.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_shmem_posix_la_SOURCES = $(sources) mca_shmem_posix_la_LDFLAGS = -module -avoid-version @@ -47,4 +47,4 @@ libmca_shmem_posix_la_SOURCES = $(sources) libmca_shmem_posix_la_LDFLAGS = -module -avoid-version # help file -dist_pkgdata_DATA = help-opal-shmem-posix.txt +dist_ompidata_DATA = help-opal-shmem-posix.txt diff --git a/opal/mca/shmem/sysv/Makefile.am b/opal/mca/shmem/sysv/Makefile.am index 8dfcdc083e..dcb28c3bc9 100644 --- a/opal/mca/shmem/sysv/Makefile.am +++ b/opal/mca/shmem/sysv/Makefile.am @@ -35,7 +35,7 @@ component_noinst = libmca_shmem_sysv.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_shmem_sysv_la_SOURCES = $(sources) mca_shmem_sysv_la_LDFLAGS = -module -avoid-version @@ -45,4 +45,4 @@ libmca_shmem_sysv_la_SOURCES = $(sources) libmca_shmem_sysv_la_LDFLAGS = -module -avoid-version # help file -dist_pkgdata_DATA = help-opal-shmem-sysv.txt +dist_ompidata_DATA = help-opal-shmem-sysv.txt diff --git a/opal/mca/timer/Makefile.am b/opal/mca/timer/Makefile.am index 76b288e8a3..b6599f2ee1 100644 --- a/opal/mca/timer/Makefile.am +++ b/opal/mca/timer/Makefile.am @@ -28,7 +28,7 @@ libmca_timer_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) nobase_nodist_opal_HEADERS = $(nodist_headers) endif diff --git a/opal/runtime/Makefile.am b/opal/runtime/Makefile.am index 7be09ad559..4da98ac6e4 100644 --- a/opal/runtime/Makefile.am +++ b/opal/runtime/Makefile.am @@ -25,7 +25,7 @@ AM_CFLAGS = \ -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" # Source code files -dist_pkgdata_DATA += runtime/help-opal-runtime.txt \ +dist_ompidata_DATA += runtime/help-opal-runtime.txt \ runtime/help-opal_info.txt headers += \ diff --git a/opal/tools/opal-checkpoint/Makefile.am b/opal/tools/opal-checkpoint/Makefile.am index 377a1549c5..681b0792b3 100644 --- a/opal/tools/opal-checkpoint/Makefile.am +++ b/opal/tools/opal-checkpoint/Makefile.am @@ -36,7 +36,7 @@ nodist_man_MANS = $(man_pages) # therefore the release date or version may have changed) $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h -dist_pkgdata_DATA = help-opal-checkpoint.txt +dist_ompidata_DATA = help-opal-checkpoint.txt endif # OMPI_INSTALL_BINARIES diff --git a/opal/tools/opal-restart/Makefile.am b/opal/tools/opal-restart/Makefile.am index 82377b7ef8..86ea3dfbdd 100644 --- a/opal/tools/opal-restart/Makefile.am +++ b/opal/tools/opal-restart/Makefile.am @@ -36,7 +36,7 @@ nodist_man_MANS = $(man_pages) # therefore the release date or version may have changed) $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h -dist_pkgdata_DATA = help-opal-restart.txt +dist_ompidata_DATA = help-opal-restart.txt endif # OMPI_INSTALL_BINARIES diff --git a/opal/tools/wrappers/Makefile.am b/opal/tools/wrappers/Makefile.am index 55be16d9e2..f92fd7146d 100644 --- a/opal/tools/wrappers/Makefile.am +++ b/opal/tools/wrappers/Makefile.am @@ -32,12 +32,12 @@ bin_PROGRAMS = opal_wrapper nodist_man_MANS = opal_wrapper.1 -dist_pkgdata_DATA = help-opal-wrapper.txt +dist_ompidata_DATA = help-opal-wrapper.txt # Only install the following for developer-level installs if WANT_INSTALL_HEADERS -nodist_pkgdata_DATA = \ +nodist_ompidata_DATA = \ opalcc-wrapper-data.txt \ opalc++-wrapper-data.txt diff --git a/opal/util/Makefile.am b/opal/util/Makefile.am index c6ab37d304..8ff825fc87 100644 --- a/opal/util/Makefile.am +++ b/opal/util/Makefile.am @@ -21,7 +21,7 @@ SUBDIRS = keyval -dist_pkgdata_DATA = help-opal-util.txt +dist_ompidata_DATA = help-opal-util.txt AM_LFLAGS = -Popal_show_help_yy LEX_OUTPUT_ROOT = lex.opal_show_help_yy @@ -108,6 +108,6 @@ libopalutil_la_DEPENDENCIES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(includedir)/openmpi/$(subdir) +opaldir = $(ompiincludedir)/$(subdir) opal_HEADERS = $(headers) endif diff --git a/orte/Makefile.am b/orte/Makefile.am index de3dd1911f..06e59353c5 100644 --- a/orte/Makefile.am +++ b/orte/Makefile.am @@ -44,13 +44,13 @@ libopen_rte_la_LDFLAGS = -version-info $(libopen_rte_so_version) # included subdirectory Makefile.am's and appended-to variables headers = noinst_LTLIBRARIES = -dist_pkgdata_DATA = +dist_ompidata_DATA = libopen_rte_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/include/Makefile.am b/orte/include/Makefile.am index a69d24803e..842f6e2387 100644 --- a/orte/include/Makefile.am +++ b/orte/include/Makefile.am @@ -26,7 +26,7 @@ include orte/Makefile.am EXTRA_DIST = $(headers) if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi +ortedir = $(ompiincludedir) nobase_dist_orte_HEADERS = $(headers) nobase_nodist_orte_HEADERS = $(nodist_headers) endif diff --git a/orte/mca/dfs/Makefile.am b/orte/mca/dfs/Makefile.am index 08cdb5452c..eb2f6e1265 100644 --- a/orte/mca/dfs/Makefile.am +++ b/orte/mca/dfs/Makefile.am @@ -17,7 +17,7 @@ libmca_dfs_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/dfs/app/Makefile.am b/orte/mca/dfs/app/Makefile.am index bf3407ebd5..0647dffdeb 100644 --- a/orte/mca/dfs/app/Makefile.am +++ b/orte/mca/dfs/app/Makefile.am @@ -24,7 +24,7 @@ component_noinst = libmca_dfs_app.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_dfs_app_la_SOURCES = $(sources) mca_dfs_app_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/dfs/orted/Makefile.am b/orte/mca/dfs/orted/Makefile.am index a9e941a591..4a6b0fa970 100644 --- a/orte/mca/dfs/orted/Makefile.am +++ b/orte/mca/dfs/orted/Makefile.am @@ -24,7 +24,7 @@ component_noinst = libmca_dfs_orted.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_dfs_orted_la_SOURCES = $(sources) mca_dfs_orted_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/dfs/test/Makefile.am b/orte/mca/dfs/test/Makefile.am index 19cd6c5bf8..9177007cf5 100644 --- a/orte/mca/dfs/test/Makefile.am +++ b/orte/mca/dfs/test/Makefile.am @@ -24,7 +24,7 @@ component_noinst = libmca_dfs_test.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_dfs_test_la_SOURCES = $(sources) mca_dfs_test_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/errmgr/Makefile.am b/orte/mca/errmgr/Makefile.am index 8d6c0a0317..7f88c8a0d0 100644 --- a/orte/mca/errmgr/Makefile.am +++ b/orte/mca/errmgr/Makefile.am @@ -26,11 +26,11 @@ headers = errmgr.h libmca_errmgr_la_SOURCES += $(headers) # pkgdata setup -dist_pkgdata_DATA = +dist_ompidata_DATA = # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/errmgr/base/Makefile.am b/orte/mca/errmgr/base/Makefile.am index 501982fede..146f384628 100644 --- a/orte/mca/errmgr/base/Makefile.am +++ b/orte/mca/errmgr/base/Makefile.am @@ -17,7 +17,7 @@ # $HEADER$ # -dist_pkgdata_DATA += base/help-errmgr-base.txt +dist_ompidata_DATA += base/help-errmgr-base.txt headers += \ base/errmgr_private.h \ diff --git a/orte/mca/errmgr/default_app/Makefile.am b/orte/mca/errmgr/default_app/Makefile.am index 67366f7223..f6e4646da0 100644 --- a/orte/mca/errmgr/default_app/Makefile.am +++ b/orte/mca/errmgr/default_app/Makefile.am @@ -24,7 +24,7 @@ component_noinst = libmca_errmgr_default_app.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_errmgr_default_app_la_SOURCES = $(sources) mca_errmgr_default_app_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/errmgr/default_hnp/Makefile.am b/orte/mca/errmgr/default_hnp/Makefile.am index 6aa80021f3..7109b244a1 100644 --- a/orte/mca/errmgr/default_hnp/Makefile.am +++ b/orte/mca/errmgr/default_hnp/Makefile.am @@ -24,7 +24,7 @@ component_noinst = libmca_errmgr_default_hnp.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_errmgr_default_hnp_la_SOURCES = $(sources) mca_errmgr_default_hnp_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/errmgr/default_orted/Makefile.am b/orte/mca/errmgr/default_orted/Makefile.am index 54f19802d3..8dff4f5ece 100644 --- a/orte/mca/errmgr/default_orted/Makefile.am +++ b/orte/mca/errmgr/default_orted/Makefile.am @@ -24,7 +24,7 @@ component_noinst = libmca_errmgr_default_orted.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_errmgr_default_orted_la_SOURCES = $(sources) mca_errmgr_default_orted_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/errmgr/default_tool/Makefile.am b/orte/mca/errmgr/default_tool/Makefile.am index cf9ffe0e5d..b85e440a99 100644 --- a/orte/mca/errmgr/default_tool/Makefile.am +++ b/orte/mca/errmgr/default_tool/Makefile.am @@ -24,7 +24,7 @@ component_noinst = libmca_errmgr_default_tool.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_errmgr_default_tool_la_SOURCES = $(sources) mca_errmgr_default_tool_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/ess/Makefile.am b/orte/mca/ess/Makefile.am index 3aec4f5e52..771ffb3443 100644 --- a/orte/mca/ess/Makefile.am +++ b/orte/mca/ess/Makefile.am @@ -24,7 +24,7 @@ noinst_LTLIBRARIES = libmca_ess.la libmca_ess_la_SOURCES = # pkgdata setup -dist_pkgdata_DATA = +dist_ompidata_DATA = # local files headers = ess.h @@ -32,7 +32,7 @@ libmca_ess_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/ess/alps/Makefile.am b/orte/mca/ess/alps/Makefile.am index b76da0cd95..69e9dddb02 100644 --- a/orte/mca/ess/alps/Makefile.am +++ b/orte/mca/ess/alps/Makefile.am @@ -34,7 +34,7 @@ component_noinst = libmca_ess_alps.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ess_alps_la_SOURCES = $(sources) mca_ess_alps_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/ess/base/Makefile.am b/orte/mca/ess/base/Makefile.am index 5716801ce7..d4be3c5aa3 100644 --- a/orte/mca/ess/base/Makefile.am +++ b/orte/mca/ess/base/Makefile.am @@ -17,7 +17,7 @@ # $HEADER$ # -dist_pkgdata_DATA += base/help-ess-base.txt +dist_ompidata_DATA += base/help-ess-base.txt headers += \ base/base.h diff --git a/orte/mca/ess/env/Makefile.am b/orte/mca/ess/env/Makefile.am index 1d6291fe10..2669dce868 100644 --- a/orte/mca/ess/env/Makefile.am +++ b/orte/mca/ess/env/Makefile.am @@ -34,7 +34,7 @@ component_noinst = libmca_ess_env.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ess_env_la_SOURCES = $(sources) mca_ess_env_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/ess/hnp/Makefile.am b/orte/mca/ess/hnp/Makefile.am index 943c6510a2..7fb360a860 100644 --- a/orte/mca/ess/hnp/Makefile.am +++ b/orte/mca/ess/hnp/Makefile.am @@ -34,7 +34,7 @@ component_noinst = libmca_ess_hnp.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ess_hnp_la_SOURCES = $(sources) mca_ess_hnp_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/ess/lsf/Makefile.am b/orte/mca/ess/lsf/Makefile.am index a07073b2db..e4702a8f1b 100644 --- a/orte/mca/ess/lsf/Makefile.am +++ b/orte/mca/ess/lsf/Makefile.am @@ -36,7 +36,7 @@ component_noinst = libmca_ess_lsf.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ess_lsf_la_SOURCES = $(sources) mca_ess_lsf_la_LDFLAGS = -module -avoid-version $(ess_lsf_LDFLAGS) diff --git a/orte/mca/ess/pmi/Makefile.am b/orte/mca/ess/pmi/Makefile.am index 93b27962d5..66c445b8e8 100644 --- a/orte/mca/ess/pmi/Makefile.am +++ b/orte/mca/ess/pmi/Makefile.am @@ -28,7 +28,7 @@ component_noinst = libmca_ess_pmi.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ess_pmi_la_SOURCES = $(sources) mca_ess_pmi_la_LDFLAGS = -module -avoid-version $(ess_pmi_LDFLAGS) diff --git a/orte/mca/ess/singleton/Makefile.am b/orte/mca/ess/singleton/Makefile.am index b356ebd18f..a32af3b211 100644 --- a/orte/mca/ess/singleton/Makefile.am +++ b/orte/mca/ess/singleton/Makefile.am @@ -33,7 +33,7 @@ component_noinst = libmca_ess_singleton.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ess_singleton_la_SOURCES = $(sources) mca_ess_singleton_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/ess/slurm/Makefile.am b/orte/mca/ess/slurm/Makefile.am index db86a91466..902b266148 100644 --- a/orte/mca/ess/slurm/Makefile.am +++ b/orte/mca/ess/slurm/Makefile.am @@ -33,7 +33,7 @@ component_noinst = libmca_ess_slurm.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ess_slurm_la_SOURCES = $(sources) mca_ess_slurm_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/ess/tm/Makefile.am b/orte/mca/ess/tm/Makefile.am index 9a26c75dda..585a01b556 100644 --- a/orte/mca/ess/tm/Makefile.am +++ b/orte/mca/ess/tm/Makefile.am @@ -33,7 +33,7 @@ component_noinst = libmca_ess_tm.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ess_tm_la_SOURCES = $(sources) mca_ess_tm_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/ess/tool/Makefile.am b/orte/mca/ess/tool/Makefile.am index daa229dfcd..1bada19901 100644 --- a/orte/mca/ess/tool/Makefile.am +++ b/orte/mca/ess/tool/Makefile.am @@ -34,7 +34,7 @@ component_noinst = libmca_ess_tool.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ess_tool_la_SOURCES = $(sources) mca_ess_tool_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/filem/Makefile.am b/orte/mca/filem/Makefile.am index 068f247596..ca62496895 100644 --- a/orte/mca/filem/Makefile.am +++ b/orte/mca/filem/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 -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/filem/base/Makefile.am b/orte/mca/filem/base/Makefile.am index 71c18c920a..b7adedc8b4 100644 --- a/orte/mca/filem/base/Makefile.am +++ b/orte/mca/filem/base/Makefile.am @@ -25,4 +25,4 @@ libmca_filem_la_SOURCES += \ base/filem_base_receive.c \ base/filem_base_fns.c -dist_pkgdata_DATA = base/help-orte-filem-base.txt +dist_ompidata_DATA = base/help-orte-filem-base.txt diff --git a/orte/mca/filem/raw/Makefile.am b/orte/mca/filem/raw/Makefile.am index f64e09841c..8da6803947 100644 --- a/orte/mca/filem/raw/Makefile.am +++ b/orte/mca/filem/raw/Makefile.am @@ -17,7 +17,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-filem-raw.txt +dist_ompidata_DATA = help-orte-filem-raw.txt sources = \ filem_raw.h \ @@ -36,7 +36,7 @@ component_noinst = libmca_filem_raw.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_filem_raw_la_SOURCES = $(sources) mca_filem_raw_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/grpcomm/Makefile.am b/orte/mca/grpcomm/Makefile.am index 8b5041fd5e..d0ca987b39 100644 --- a/orte/mca/grpcomm/Makefile.am +++ b/orte/mca/grpcomm/Makefile.am @@ -29,7 +29,7 @@ libmca_grpcomm_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/grpcomm/bad/Makefile.am b/orte/mca/grpcomm/bad/Makefile.am index a4ad692de2..be4e06afee 100644 --- a/orte/mca/grpcomm/bad/Makefile.am +++ b/orte/mca/grpcomm/bad/Makefile.am @@ -34,7 +34,7 @@ component_noinst = libmca_grpcomm_bad.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_grpcomm_bad_la_SOURCES = $(sources) mca_grpcomm_bad_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/grpcomm/hier/Makefile.am b/orte/mca/grpcomm/hier/Makefile.am index e320f6d176..6579d50826 100644 --- a/orte/mca/grpcomm/hier/Makefile.am +++ b/orte/mca/grpcomm/hier/Makefile.am @@ -34,7 +34,7 @@ component_noinst = libmca_grpcomm_hier.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_grpcomm_hier_la_SOURCES = $(sources) mca_grpcomm_hier_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/grpcomm/pmi/Makefile.am b/orte/mca/grpcomm/pmi/Makefile.am index 733ebd160f..7bfe5cfb4b 100644 --- a/orte/mca/grpcomm/pmi/Makefile.am +++ b/orte/mca/grpcomm/pmi/Makefile.am @@ -28,7 +28,7 @@ component_noinst = libmca_grpcomm_pmi.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_grpcomm_pmi_la_SOURCES = $(sources) mca_grpcomm_pmi_la_LDFLAGS = -module -avoid-version $(grpcomm_pmi_LDFLAGS) diff --git a/orte/mca/iof/Makefile.am b/orte/mca/iof/Makefile.am index efe95b4fba..1ca7b4fee0 100644 --- a/orte/mca/iof/Makefile.am +++ b/orte/mca/iof/Makefile.am @@ -30,7 +30,7 @@ libmca_iof_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/iof/hnp/Makefile.am b/orte/mca/iof/hnp/Makefile.am index 8de06cc575..aa7dcda1ef 100644 --- a/orte/mca/iof/hnp/Makefile.am +++ b/orte/mca/iof/hnp/Makefile.am @@ -37,7 +37,7 @@ hnp_SOURCES = \ iof_hnp_send.c \ iof_hnp_receive.c -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_iof_hnp_la_SOURCES = $(hnp_SOURCES) mca_iof_hnp_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/iof/mr_hnp/Makefile.am b/orte/mca/iof/mr_hnp/Makefile.am index 947184bb0f..17e7685e91 100644 --- a/orte/mca/iof/mr_hnp/Makefile.am +++ b/orte/mca/iof/mr_hnp/Makefile.am @@ -27,7 +27,7 @@ mr_hnp_SOURCES = \ iof_mrhnp_read.c \ iof_mrhnp_receive.c -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_iof_mr_hnp_la_SOURCES = $(mr_hnp_SOURCES) mca_iof_mr_hnp_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/iof/mr_orted/Makefile.am b/orte/mca/iof/mr_orted/Makefile.am index 10945cab32..836612acd9 100644 --- a/orte/mca/iof/mr_orted/Makefile.am +++ b/orte/mca/iof/mr_orted/Makefile.am @@ -27,7 +27,7 @@ mr_orted_SOURCES = \ iof_mrorted_read.c \ iof_mrorted_receive.c -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_iof_mr_orted_la_SOURCES = $(mr_orted_SOURCES) mca_iof_mr_orted_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/iof/orted/Makefile.am b/orte/mca/iof/orted/Makefile.am index ddc40d8e36..b3badd738f 100644 --- a/orte/mca/iof/orted/Makefile.am +++ b/orte/mca/iof/orted/Makefile.am @@ -36,7 +36,7 @@ orted_SOURCES = \ iof_orted_read.c \ iof_orted_receive.c -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_iof_orted_la_SOURCES = $(orted_SOURCES) mca_iof_orted_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/iof/tool/Makefile.am b/orte/mca/iof/tool/Makefile.am index 3d44ec60e4..170b1b39fe 100644 --- a/orte/mca/iof/tool/Makefile.am +++ b/orte/mca/iof/tool/Makefile.am @@ -35,7 +35,7 @@ tool_SOURCES = \ iof_tool_component.c \ iof_tool_receive.c -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_iof_tool_la_SOURCES = $(tool_SOURCES) mca_iof_tool_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/odls/Makefile.am b/orte/mca/odls/Makefile.am index eb0f22a072..2d398ce4fb 100644 --- a/orte/mca/odls/Makefile.am +++ b/orte/mca/odls/Makefile.am @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libmca_odls.la libmca_odls_la_SOURCES = # pkgdata setup -dist_pkgdata_DATA = +dist_ompidata_DATA = # local files headers = odls.h odls_types.h @@ -30,7 +30,7 @@ libmca_odls_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/odls/base/Makefile.am b/orte/mca/odls/base/Makefile.am index b1a79eed69..4bfdbb758d 100644 --- a/orte/mca/odls/base/Makefile.am +++ b/orte/mca/odls/base/Makefile.am @@ -27,4 +27,4 @@ libmca_odls_la_SOURCES += \ base/odls_base_select.c \ base/odls_base_default_fns.c -dist_pkgdata_DATA += base/help-orte-odls-base.txt +dist_ompidata_DATA += base/help-orte-odls-base.txt diff --git a/orte/mca/odls/default/Makefile.am b/orte/mca/odls/default/Makefile.am index 80a28c4b8e..31a30c93e6 100644 --- a/orte/mca/odls/default/Makefile.am +++ b/orte/mca/odls/default/Makefile.am @@ -17,7 +17,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-odls-default.txt +dist_ompidata_DATA = help-orte-odls-default.txt sources = \ odls_default.h \ @@ -36,7 +36,7 @@ component_noinst = libmca_odls_default.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_odls_default_la_SOURCES = $(sources) mca_odls_default_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/oob/Makefile.am b/orte/mca/oob/Makefile.am index dd6a493d2f..43cbdf6163 100644 --- a/orte/mca/oob/Makefile.am +++ b/orte/mca/oob/Makefile.am @@ -27,7 +27,7 @@ libmca_oob_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/oob/tcp/Makefile.am b/orte/mca/oob/tcp/Makefile.am index 2605975764..ffd590ca01 100644 --- a/orte/mca/oob/tcp/Makefile.am +++ b/orte/mca/oob/tcp/Makefile.am @@ -48,7 +48,7 @@ component_noinst = libmca_oob_tcp.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_oob_tcp_la_SOURCES = $(sources) mca_oob_tcp_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/oob/ud/Makefile.am b/orte/mca/oob/ud/Makefile.am index e85a1841ce..85575ea63e 100644 --- a/orte/mca/oob/ud/Makefile.am +++ b/orte/mca/oob/ud/Makefile.am @@ -19,7 +19,7 @@ AM_CPPFLAGS = $(orte_oob_ud_CPPFLAGS) -dist_pkgdata_DATA = help-oob-ud.txt +dist_ompidata_DATA = help-oob-ud.txt sources = \ oob_ud_component.c \ @@ -48,7 +48,7 @@ component_noinst = libmca_oob_ud.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_oob_ud_la_SOURCES = $(sources) mca_oob_ud_la_LDFLAGS = -module -avoid-version $(orte_oob_ud_LDFLAGS) diff --git a/orte/mca/plm/Makefile.am b/orte/mca/plm/Makefile.am index 33371d0189..6b62cc8228 100644 --- a/orte/mca/plm/Makefile.am +++ b/orte/mca/plm/Makefile.am @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libmca_plm.la libmca_plm_la_SOURCES = # pkgdata setup -dist_pkgdata_DATA = +dist_ompidata_DATA = # local files headers = plm.h plm_types.h @@ -30,7 +30,7 @@ libmca_plm_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/plm/alps/Makefile.am b/orte/mca/plm/alps/Makefile.am index 35a1a5db81..f0a0ecf6f9 100644 --- a/orte/mca/plm/alps/Makefile.am +++ b/orte/mca/plm/alps/Makefile.am @@ -22,7 +22,7 @@ sources = \ plm_alps_component.c \ plm_alps_module.c -dist_pkgdata_DATA = help-plm-alps.txt +dist_ompidata_DATA = help-plm-alps.txt # Make the output library in this directory, and name it either # mca__.la (for DSO builds) or libmca__.la @@ -36,7 +36,7 @@ component_noinst = libmca_plm_alps.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_plm_alps_la_SOURCES = $(sources) mca_plm_alps_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/plm/base/Makefile.am b/orte/mca/plm/base/Makefile.am index 8c0686f257..02b3f4a4df 100644 --- a/orte/mca/plm/base/Makefile.am +++ b/orte/mca/plm/base/Makefile.am @@ -30,4 +30,4 @@ libmca_plm_la_SOURCES += \ base/plm_base_proxy.c \ base/plm_base_orted_cmds.c -dist_pkgdata_DATA += base/help-plm-base.txt +dist_ompidata_DATA += base/help-plm-base.txt diff --git a/orte/mca/plm/lsf/Makefile.am b/orte/mca/plm/lsf/Makefile.am index d81f4ed174..c7e96db8b0 100644 --- a/orte/mca/plm/lsf/Makefile.am +++ b/orte/mca/plm/lsf/Makefile.am @@ -21,7 +21,7 @@ AM_CPPFLAGS = $(plm_lsf_CPPFLAGS) -dist_pkgdata_DATA = help-plm-lsf.txt +dist_ompidata_DATA = help-plm-lsf.txt sources = \ plm_lsf.h \ @@ -40,7 +40,7 @@ component_noinst = libmca_plm_lsf.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_plm_lsf_la_SOURCES = $(sources) mca_plm_lsf_la_LDFLAGS = -module -avoid-version $(plm_lsf_LDFLAGS) diff --git a/orte/mca/plm/rsh/Makefile.am b/orte/mca/plm/rsh/Makefile.am index bf9ddf3922..e19bbf7076 100644 --- a/orte/mca/plm/rsh/Makefile.am +++ b/orte/mca/plm/rsh/Makefile.am @@ -17,7 +17,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-plm-rsh.txt +dist_ompidata_DATA = help-plm-rsh.txt sources = \ plm_rsh.h \ @@ -36,7 +36,7 @@ component_noinst = libmca_plm_rsh.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_plm_rsh_la_SOURCES = $(sources) mca_plm_rsh_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/plm/slurm/Makefile.am b/orte/mca/plm/slurm/Makefile.am index 8ba39bae4b..159ff21255 100644 --- a/orte/mca/plm/slurm/Makefile.am +++ b/orte/mca/plm/slurm/Makefile.am @@ -22,7 +22,7 @@ sources = \ plm_slurm_component.c \ plm_slurm_module.c -dist_pkgdata_DATA = help-plm-slurm.txt +dist_ompidata_DATA = help-plm-slurm.txt # Make the output library in this directory, and name it either # mca__.la (for DSO builds) or libmca__.la @@ -36,7 +36,7 @@ component_noinst = libmca_plm_slurm.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_plm_slurm_la_SOURCES = $(sources) mca_plm_slurm_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/plm/tm/Makefile.am b/orte/mca/plm/tm/Makefile.am index 7dfbe26636..59120c0260 100644 --- a/orte/mca/plm/tm/Makefile.am +++ b/orte/mca/plm/tm/Makefile.am @@ -19,7 +19,7 @@ AM_CPPFLAGS = $(plm_tm_CPPFLAGS) -dist_pkgdata_DATA = help-plm-tm.txt +dist_ompidata_DATA = help-plm-tm.txt sources = \ plm_tm.h \ @@ -42,7 +42,7 @@ component = component_sources = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component) mca_plm_tm_la_SOURCES = $(component_sources) mca_plm_tm_la_LDFLAGS = -module -avoid-version $(plm_tm_LDFLAGS) diff --git a/orte/mca/ras/Makefile.am b/orte/mca/ras/Makefile.am index 5ba4d84325..e8677f6906 100644 --- a/orte/mca/ras/Makefile.am +++ b/orte/mca/ras/Makefile.am @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libmca_ras.la libmca_ras_la_SOURCES = # pkgdata setup -dist_pkgdata_DATA = +dist_ompidata_DATA = # local files headers = ras.h ras_types.h @@ -30,7 +30,7 @@ libmca_ras_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/ras/alps/Makefile.am b/orte/mca/ras/alps/Makefile.am index b9f5649934..cfccb6c81d 100644 --- a/orte/mca/ras/alps/Makefile.am +++ b/orte/mca/ras/alps/Makefile.am @@ -20,7 +20,7 @@ AM_CPPFLAGS = $(ras_alps_CPPFLAGS) -dist_pkgdata_DATA = help-ras-alps.txt \ +dist_ompidata_DATA = help-ras-alps.txt \ ras-alps-command.sh install-data-hook: @@ -48,7 +48,7 @@ component = component_sources = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component) mca_ras_alps_la_SOURCES = $(component_sources) mca_ras_alps_la_LDFLAGS = -module -avoid-version $(ras_alps_LDFLAGS) diff --git a/orte/mca/ras/base/Makefile.am b/orte/mca/ras/base/Makefile.am index 3c27f767f6..ef0440b21b 100644 --- a/orte/mca/ras/base/Makefile.am +++ b/orte/mca/ras/base/Makefile.am @@ -16,7 +16,7 @@ # $HEADER$ # -dist_pkgdata_DATA += base/help-ras-base.txt +dist_ompidata_DATA += base/help-ras-base.txt headers += \ base/base.h \ diff --git a/orte/mca/ras/gridengine/Makefile.am b/orte/mca/ras/gridengine/Makefile.am index f0b8e04515..94bf9bf557 100644 --- a/orte/mca/ras/gridengine/Makefile.am +++ b/orte/mca/ras/gridengine/Makefile.am @@ -19,7 +19,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-ras-gridengine.txt +dist_ompidata_DATA = help-ras-gridengine.txt sources = \ ras_gridengine.h \ @@ -38,7 +38,7 @@ component_noinst = libmca_ras_gridengine.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ras_gridengine_la_SOURCES = $(sources) mca_ras_gridengine_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/ras/loadleveler/Makefile.am b/orte/mca/ras/loadleveler/Makefile.am index 9c9b3b573d..fda8a15279 100644 --- a/orte/mca/ras/loadleveler/Makefile.am +++ b/orte/mca/ras/loadleveler/Makefile.am @@ -41,7 +41,7 @@ component = component_sources = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component) mca_ras_loadleveler_la_SOURCES = $(component_sources) mca_ras_loadleveler_la_LDFLAGS = -module -avoid-version $(ras_loadleveler_LDFLAGS) diff --git a/orte/mca/ras/lsf/Makefile.am b/orte/mca/ras/lsf/Makefile.am index ecfa571967..01099d8083 100644 --- a/orte/mca/ras/lsf/Makefile.am +++ b/orte/mca/ras/lsf/Makefile.am @@ -17,7 +17,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-ras-lsf.txt +dist_ompidata_DATA = help-ras-lsf.txt # Make the output library in this directory, and name it either # mca__.la (for DSO builds) or libmca__.la @@ -38,7 +38,7 @@ proxy_SOURCES = \ ras_lsf_module.c \ ras_lsf_component.c -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ras_lsf_la_SOURCES = $(proxy_SOURCES) mca_ras_lsf_la_LIBADD = $(ras_lsf_LIBS) diff --git a/orte/mca/ras/simulator/Makefile.am b/orte/mca/ras/simulator/Makefile.am index 771a238ead..3efc47a02c 100644 --- a/orte/mca/ras/simulator/Makefile.am +++ b/orte/mca/ras/simulator/Makefile.am @@ -7,7 +7,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-ras-simulator.txt +dist_ompidata_DATA = help-ras-simulator.txt sources = \ ras_sim.h \ @@ -30,7 +30,7 @@ component = component_sources = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component) mca_ras_simulator_la_SOURCES = $(component_sources) mca_ras_simulator_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/ras/slurm/Makefile.am b/orte/mca/ras/slurm/Makefile.am index 8a138b35e2..e6994b40d0 100644 --- a/orte/mca/ras/slurm/Makefile.am +++ b/orte/mca/ras/slurm/Makefile.am @@ -19,7 +19,7 @@ AM_CPPFLAGS = $(ras_slurm_CPPFLAGS) -dist_pkgdata_DATA = help-ras-slurm.txt +dist_ompidata_DATA = help-ras-slurm.txt sources = \ ras_slurm.h \ @@ -43,7 +43,7 @@ component = component_sources = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component) mca_ras_slurm_la_SOURCES = $(component_sources) mca_ras_slurm_la_LDFLAGS = -module -avoid-version $(ras_slurm_LDFLAGS) diff --git a/orte/mca/ras/tm/Makefile.am b/orte/mca/ras/tm/Makefile.am index 66e7789cf0..f7086591be 100644 --- a/orte/mca/ras/tm/Makefile.am +++ b/orte/mca/ras/tm/Makefile.am @@ -19,7 +19,7 @@ # Use the top-level Makefile.options -dist_pkgdata_DATA = help-ras-tm.txt +dist_ompidata_DATA = help-ras-tm.txt AM_CPPFLAGS = $(ras_tm_CPPFLAGS) @@ -46,7 +46,7 @@ component = component_sources = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component) mca_ras_tm_la_SOURCES = $(component_sources) mca_ras_tm_la_LDFLAGS = -module -avoid-version $(ras_tm_LDFLAGS) diff --git a/orte/mca/rmaps/Makefile.am b/orte/mca/rmaps/Makefile.am index 7f3573e664..fc665eaa48 100644 --- a/orte/mca/rmaps/Makefile.am +++ b/orte/mca/rmaps/Makefile.am @@ -27,7 +27,7 @@ libmca_rmaps_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/rmaps/base/Makefile.am b/orte/mca/rmaps/base/Makefile.am index 27760a299a..33da470041 100644 --- a/orte/mca/rmaps/base/Makefile.am +++ b/orte/mca/rmaps/base/Makefile.am @@ -31,7 +31,7 @@ libmca_rmaps_la_SOURCES += \ base/rmaps_base_ranking.c \ base/rmaps_base_print_fns.c -dist_pkgdata_DATA = base/help-orte-rmaps-base.txt +dist_ompidata_DATA = base/help-orte-rmaps-base.txt if OPAL_HAVE_HWLOC libmca_rmaps_la_SOURCES += \ diff --git a/orte/mca/rmaps/lama/Makefile.am b/orte/mca/rmaps/lama/Makefile.am index 35e0e98de8..d3ac1b40f5 100644 --- a/orte/mca/rmaps/lama/Makefile.am +++ b/orte/mca/rmaps/lama/Makefile.am @@ -9,7 +9,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-rmaps-lama.txt +dist_ompidata_DATA = help-orte-rmaps-lama.txt sources = \ rmaps_lama_module.c \ @@ -30,7 +30,7 @@ component_noinst = libmca_rmaps_lama.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_lama_la_SOURCES = $(sources) mca_rmaps_lama_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/rmaps/mindist/Makefile.am b/orte/mca/rmaps/mindist/Makefile.am index 92120c9b35..ba66203c13 100644 --- a/orte/mca/rmaps/mindist/Makefile.am +++ b/orte/mca/rmaps/mindist/Makefile.am @@ -18,7 +18,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-rmaps-md.txt +dist_ompidata_DATA = help-orte-rmaps-md.txt sources = \ rmaps_mindist.h \ @@ -37,7 +37,7 @@ component_noinst = libmca_rmaps_mindist.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_mindist_la_SOURCES = $(sources) mca_rmaps_mindist_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/rmaps/ppr/Makefile.am b/orte/mca/rmaps/ppr/Makefile.am index ec37020760..0162847c06 100644 --- a/orte/mca/rmaps/ppr/Makefile.am +++ b/orte/mca/rmaps/ppr/Makefile.am @@ -7,7 +7,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-rmaps-ppr.txt +dist_ompidata_DATA = help-orte-rmaps-ppr.txt sources = \ rmaps_ppr.c \ @@ -26,7 +26,7 @@ component_noinst = libmca_rmaps_ppr.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_ppr_la_SOURCES = $(sources) mca_rmaps_ppr_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/rmaps/rank_file/Makefile.am b/orte/mca/rmaps/rank_file/Makefile.am index 47b08192aa..920d156b25 100644 --- a/orte/mca/rmaps/rank_file/Makefile.am +++ b/orte/mca/rmaps/rank_file/Makefile.am @@ -21,7 +21,7 @@ AM_LFLAGS = -Porte_rmaps_rank_file_ LEX_OUTPUT_ROOT = lex.orte_rmaps_rank_file_ -dist_pkgdata_DATA = help-rmaps_rank_file.txt +dist_ompidata_DATA = help-rmaps_rank_file.txt sources = \ rmaps_rank_file.c \ @@ -42,7 +42,7 @@ component_noinst = libmca_rmaps_rank_file.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_rank_file_la_SOURCES = $(sources) mca_rmaps_rank_file_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/rmaps/resilient/Makefile.am b/orte/mca/rmaps/resilient/Makefile.am index ad6d2fc6b4..b5384fcc53 100644 --- a/orte/mca/rmaps/resilient/Makefile.am +++ b/orte/mca/rmaps/resilient/Makefile.am @@ -8,7 +8,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-rmaps-resilient.txt +dist_ompidata_DATA = help-orte-rmaps-resilient.txt sources = \ rmaps_resilient.c \ @@ -27,7 +27,7 @@ component_noinst = libmca_rmaps_resilient.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_resilient_la_SOURCES = $(sources) mca_rmaps_resilient_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/rmaps/round_robin/Makefile.am b/orte/mca/rmaps/round_robin/Makefile.am index c992977f72..ba4c538c60 100644 --- a/orte/mca/rmaps/round_robin/Makefile.am +++ b/orte/mca/rmaps/round_robin/Makefile.am @@ -17,7 +17,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-rmaps-rr.txt +dist_ompidata_DATA = help-orte-rmaps-rr.txt sources = \ rmaps_rr.c \ @@ -37,7 +37,7 @@ component_noinst = libmca_rmaps_round_robin.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_round_robin_la_SOURCES = $(sources) mca_rmaps_round_robin_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/rmaps/seq/Makefile.am b/orte/mca/rmaps/seq/Makefile.am index 12e90860e2..63cd622f47 100644 --- a/orte/mca/rmaps/seq/Makefile.am +++ b/orte/mca/rmaps/seq/Makefile.am @@ -17,7 +17,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-rmaps-seq.txt +dist_ompidata_DATA = help-orte-rmaps-seq.txt sources = \ rmaps_seq.c \ @@ -36,7 +36,7 @@ component_noinst = libmca_rmaps_seq.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_seq_la_SOURCES = $(sources) mca_rmaps_seq_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/rmaps/staged/Makefile.am b/orte/mca/rmaps/staged/Makefile.am index b7cd9bc9f3..c36561e0ca 100644 --- a/orte/mca/rmaps/staged/Makefile.am +++ b/orte/mca/rmaps/staged/Makefile.am @@ -25,7 +25,7 @@ component_noinst = libmca_rmaps_staged.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_staged_la_SOURCES = $(sources) mca_rmaps_staged_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/rml/Makefile.am b/orte/mca/rml/Makefile.am index 606146d5b4..7a8a5b2af2 100644 --- a/orte/mca/rml/Makefile.am +++ b/orte/mca/rml/Makefile.am @@ -29,7 +29,7 @@ libmca_rml_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/rml/ftrm/Makefile.am b/orte/mca/rml/ftrm/Makefile.am index 6729fc2e40..4235a8706b 100644 --- a/orte/mca/rml/ftrm/Makefile.am +++ b/orte/mca/rml/ftrm/Makefile.am @@ -34,7 +34,7 @@ component_noinst = libmca_rml_ftrm.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rml_ftrm_la_SOURCES = $(sources) mca_rml_ftrm_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/rml/oob/Makefile.am b/orte/mca/rml/oob/Makefile.am index 46bdc4869b..849bd1bf6a 100644 --- a/orte/mca/rml/oob/Makefile.am +++ b/orte/mca/rml/oob/Makefile.am @@ -38,7 +38,7 @@ component_noinst = libmca_rml_oob.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rml_oob_la_SOURCES = $(sources) mca_rml_oob_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/routed/Makefile.am b/orte/mca/routed/Makefile.am index c16bc211a5..452807f724 100644 --- a/orte/mca/routed/Makefile.am +++ b/orte/mca/routed/Makefile.am @@ -21,7 +21,7 @@ libmca_routed_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/routed/binomial/Makefile.am b/orte/mca/routed/binomial/Makefile.am index c1301d7d08..2fb72e2689 100644 --- a/orte/mca/routed/binomial/Makefile.am +++ b/orte/mca/routed/binomial/Makefile.am @@ -28,7 +28,7 @@ component_noinst = libmca_routed_binomial.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_routed_binomial_la_SOURCES = $(sources) mca_routed_binomial_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/routed/debruijn/Makefile.am b/orte/mca/routed/debruijn/Makefile.am index a6f32ac81b..1b47ca6d7d 100644 --- a/orte/mca/routed/debruijn/Makefile.am +++ b/orte/mca/routed/debruijn/Makefile.am @@ -28,7 +28,7 @@ component_noinst = libmca_routed_debruijn.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_routed_debruijn_la_SOURCES = $(sources) mca_routed_debruijn_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/routed/direct/Makefile.am b/orte/mca/routed/direct/Makefile.am index 3bfc0e4b52..5dd55fb9ae 100644 --- a/orte/mca/routed/direct/Makefile.am +++ b/orte/mca/routed/direct/Makefile.am @@ -26,7 +26,7 @@ component_noinst = libmca_routed_direct.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_routed_direct_la_SOURCES = $(sources) mca_routed_direct_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/routed/radix/Makefile.am b/orte/mca/routed/radix/Makefile.am index 5f8bf65c12..535d4433a7 100644 --- a/orte/mca/routed/radix/Makefile.am +++ b/orte/mca/routed/radix/Makefile.am @@ -26,7 +26,7 @@ component_noinst = libmca_routed_radix.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_routed_radix_la_SOURCES = $(sources) mca_routed_radix_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/sensor/Makefile.am b/orte/mca/sensor/Makefile.am index 03c370f076..30f6a79640 100644 --- a/orte/mca/sensor/Makefile.am +++ b/orte/mca/sensor/Makefile.am @@ -20,7 +20,7 @@ libmca_sensor_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/sensor/file/Makefile.am b/orte/mca/sensor/file/Makefile.am index ef0392cd76..7c9e7ba7cd 100644 --- a/orte/mca/sensor/file/Makefile.am +++ b/orte/mca/sensor/file/Makefile.am @@ -7,7 +7,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-sensor-file.txt +dist_ompidata_DATA = help-orte-sensor-file.txt sources = \ sensor_file.c \ @@ -26,7 +26,7 @@ component_noinst = libmca_sensor_file.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_sensor_file_la_SOURCES = $(sources) mca_sensor_file_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/sensor/ft_tester/Makefile.am b/orte/mca/sensor/ft_tester/Makefile.am index cf714f6b3d..7af20136c5 100644 --- a/orte/mca/sensor/ft_tester/Makefile.am +++ b/orte/mca/sensor/ft_tester/Makefile.am @@ -25,7 +25,7 @@ component_noinst = libmca_sensor_ft_tester.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_sensor_ft_tester_la_SOURCES = $(sources) mca_sensor_ft_tester_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/sensor/heartbeat/Makefile.am b/orte/mca/sensor/heartbeat/Makefile.am index f880b2f894..ef10bbbf3b 100644 --- a/orte/mca/sensor/heartbeat/Makefile.am +++ b/orte/mca/sensor/heartbeat/Makefile.am @@ -8,7 +8,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-sensor-heartbeat.txt +dist_ompidata_DATA = help-orte-sensor-heartbeat.txt sources = \ sensor_heartbeat.c \ @@ -27,7 +27,7 @@ component_noinst = libmca_sensor_heartbeat.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_sensor_heartbeat_la_SOURCES = $(sources) mca_sensor_heartbeat_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/sensor/resusage/Makefile.am b/orte/mca/sensor/resusage/Makefile.am index 9bb43d3712..dbd2a127fd 100644 --- a/orte/mca/sensor/resusage/Makefile.am +++ b/orte/mca/sensor/resusage/Makefile.am @@ -8,7 +8,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-sensor-resusage.txt +dist_ompidata_DATA = help-orte-sensor-resusage.txt sources = \ sensor_resusage.c \ @@ -27,7 +27,7 @@ component_noinst = libmca_sensor_resusage.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_sensor_resusage_la_SOURCES = $(sources) mca_sensor_resusage_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/snapc/Makefile.am b/orte/mca/snapc/Makefile.am index a134a81ef8..61f4e7c1ee 100644 --- a/orte/mca/snapc/Makefile.am +++ b/orte/mca/snapc/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 -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/snapc/base/Makefile.am b/orte/mca/snapc/base/Makefile.am index 07d5b4bce7..d664f69af1 100644 --- a/orte/mca/snapc/base/Makefile.am +++ b/orte/mca/snapc/base/Makefile.am @@ -25,4 +25,4 @@ libmca_snapc_la_SOURCES += \ base/snapc_base_select.c \ base/snapc_base_fns.c -dist_pkgdata_DATA = base/help-orte-snapc-base.txt +dist_ompidata_DATA = base/help-orte-snapc-base.txt diff --git a/orte/mca/snapc/full/Makefile.am b/orte/mca/snapc/full/Makefile.am index aa1f4c6956..cc800b6a34 100644 --- a/orte/mca/snapc/full/Makefile.am +++ b/orte/mca/snapc/full/Makefile.am @@ -15,7 +15,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-snapc-full.txt +dist_ompidata_DATA = help-orte-snapc-full.txt sources = \ snapc_full.h \ @@ -37,7 +37,7 @@ component_noinst = libmca_snapc_full.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_snapc_full_la_SOURCES = $(sources) mca_snapc_full_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/sstore/Makefile.am b/orte/mca/sstore/Makefile.am index 8cc4bddd9b..73c07a2508 100644 --- a/orte/mca/sstore/Makefile.am +++ b/orte/mca/sstore/Makefile.am @@ -31,7 +31,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/sstore/base/Makefile.am b/orte/mca/sstore/base/Makefile.am index 6ecb989594..c86231311c 100644 --- a/orte/mca/sstore/base/Makefile.am +++ b/orte/mca/sstore/base/Makefile.am @@ -17,4 +17,4 @@ libmca_sstore_la_SOURCES += \ base/sstore_base_select.c \ base/sstore_base_fns.c -dist_pkgdata_DATA = base/help-orte-sstore-base.txt +dist_ompidata_DATA = base/help-orte-sstore-base.txt diff --git a/orte/mca/sstore/central/Makefile.am b/orte/mca/sstore/central/Makefile.am index 461295985f..166f041cbf 100644 --- a/orte/mca/sstore/central/Makefile.am +++ b/orte/mca/sstore/central/Makefile.am @@ -8,7 +8,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-sstore-central.txt +dist_ompidata_DATA = help-orte-sstore-central.txt sources = \ sstore_central.h \ @@ -30,7 +30,7 @@ component_noinst = libmca_sstore_central.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_sstore_central_la_SOURCES = $(sources) mca_sstore_central_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/sstore/stage/Makefile.am b/orte/mca/sstore/stage/Makefile.am index 331c995d21..b74e27f7f2 100644 --- a/orte/mca/sstore/stage/Makefile.am +++ b/orte/mca/sstore/stage/Makefile.am @@ -8,7 +8,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-orte-sstore-stage.txt +dist_ompidata_DATA = help-orte-sstore-stage.txt sources = \ sstore_stage.h \ @@ -30,7 +30,7 @@ component_noinst = libmca_sstore_stage.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_sstore_stage_la_SOURCES = $(sources) mca_sstore_stage_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/state/Makefile.am b/orte/mca/state/Makefile.am index 6763c71c41..8af5eb80cf 100644 --- a/orte/mca/state/Makefile.am +++ b/orte/mca/state/Makefile.am @@ -13,7 +13,7 @@ noinst_LTLIBRARIES = libmca_state.la libmca_state_la_SOURCES = # pkgdata setup -dist_pkgdata_DATA = +dist_ompidata_DATA = # local files headers = state.h state_types.h @@ -21,7 +21,7 @@ libmca_state_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ortedir = $(includedir)/openmpi/$(subdir) +ortedir = $(ompiincludedir)/$(subdir) nobase_orte_HEADERS = $(headers) endif diff --git a/orte/mca/state/app/Makefile.am b/orte/mca/state/app/Makefile.am index 8fa9dfa564..9b467ec5b5 100644 --- a/orte/mca/state/app/Makefile.am +++ b/orte/mca/state/app/Makefile.am @@ -25,7 +25,7 @@ component_noinst = libmca_state_app.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_state_app_la_SOURCES = $(sources) mca_state_app_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/state/hnp/Makefile.am b/orte/mca/state/hnp/Makefile.am index 47dcf2f43a..97cb47f77b 100644 --- a/orte/mca/state/hnp/Makefile.am +++ b/orte/mca/state/hnp/Makefile.am @@ -25,7 +25,7 @@ component_noinst = libmca_state_hnp.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_state_hnp_la_SOURCES = $(sources) mca_state_hnp_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/state/novm/Makefile.am b/orte/mca/state/novm/Makefile.am index 8c4816ea78..45a1471f15 100644 --- a/orte/mca/state/novm/Makefile.am +++ b/orte/mca/state/novm/Makefile.am @@ -25,7 +25,7 @@ component_noinst = libmca_state_novm.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_state_novm_la_SOURCES = $(sources) mca_state_novm_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/state/orted/Makefile.am b/orte/mca/state/orted/Makefile.am index f9cedb2dd1..8132819e0d 100644 --- a/orte/mca/state/orted/Makefile.am +++ b/orte/mca/state/orted/Makefile.am @@ -25,7 +25,7 @@ component_noinst = libmca_state_orted.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_state_orted_la_SOURCES = $(sources) mca_state_orted_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/state/staged_hnp/Makefile.am b/orte/mca/state/staged_hnp/Makefile.am index 8250ef1936..edee18e196 100644 --- a/orte/mca/state/staged_hnp/Makefile.am +++ b/orte/mca/state/staged_hnp/Makefile.am @@ -8,7 +8,7 @@ # $HEADER$ # -dist_pkgdata_DATA = help-state-staged-hnp.txt +dist_ompidata_DATA = help-state-staged-hnp.txt sources = \ state_staged_hnp.h \ @@ -27,7 +27,7 @@ component_noinst = libmca_state_staged_hnp.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_state_staged_hnp_la_SOURCES = $(sources) mca_state_staged_hnp_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/state/staged_orted/Makefile.am b/orte/mca/state/staged_orted/Makefile.am index 654c92034b..81cbd46653 100644 --- a/orte/mca/state/staged_orted/Makefile.am +++ b/orte/mca/state/staged_orted/Makefile.am @@ -25,7 +25,7 @@ component_noinst = libmca_state_staged_orted.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_state_staged_orted_la_SOURCES = $(sources) mca_state_staged_orted_la_LDFLAGS = -module -avoid-version diff --git a/orte/mca/state/tool/Makefile.am b/orte/mca/state/tool/Makefile.am index 05b773f7be..ed4a06f221 100644 --- a/orte/mca/state/tool/Makefile.am +++ b/orte/mca/state/tool/Makefile.am @@ -24,7 +24,7 @@ component_noinst = libmca_state_tool.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_state_tool_la_SOURCES = $(sources) mca_state_tool_la_LDFLAGS = -module -avoid-version diff --git a/orte/orted/Makefile.am b/orte/orted/Makefile.am index 913da5fada..69a78a7b34 100644 --- a/orte/orted/Makefile.am +++ b/orte/orted/Makefile.am @@ -19,7 +19,7 @@ # This makefile.am does not stand on its own - it is included from orte/Makefile.am -dist_pkgdata_DATA += orted/help-orted.txt +dist_ompidata_DATA += orted/help-orted.txt headers += \ orted/orted.h diff --git a/orte/runtime/Makefile.am b/orte/runtime/Makefile.am index c1875eab80..855381a560 100644 --- a/orte/runtime/Makefile.am +++ b/orte/runtime/Makefile.am @@ -22,7 +22,7 @@ # This makefile.am does not stand on its own - it is included from orte/Makefile.am -dist_pkgdata_DATA += runtime/help-orte-runtime.txt +dist_ompidata_DATA += runtime/help-orte-runtime.txt headers += \ runtime/runtime.h \ diff --git a/orte/tools/orte-checkpoint/Makefile.am b/orte/tools/orte-checkpoint/Makefile.am index 552723cdb9..ad43f169ed 100644 --- a/orte/tools/orte-checkpoint/Makefile.am +++ b/orte/tools/orte-checkpoint/Makefile.am @@ -36,7 +36,7 @@ nodist_man_MANS = $(man_pages) # therefore the release date or version may have changed) $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h -dist_pkgdata_DATA = help-orte-checkpoint.txt +dist_ompidata_DATA = help-orte-checkpoint.txt endif # OMPI_INSTALL_BINARIES diff --git a/orte/tools/orte-clean/Makefile.am b/orte/tools/orte-clean/Makefile.am index 7213a33703..7a9413343b 100644 --- a/orte/tools/orte-clean/Makefile.am +++ b/orte/tools/orte-clean/Makefile.am @@ -34,7 +34,7 @@ nodist_man_MANS = $(man_pages) # therefore the release date or version may have changed) $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h -dist_pkgdata_DATA = help-orte-clean.txt +dist_ompidata_DATA = help-orte-clean.txt endif # OMPI_INSTALL_BINARIES diff --git a/orte/tools/orte-info/Makefile.am b/orte/tools/orte-info/Makefile.am index 30cd2ba2aa..d1b3e57fed 100644 --- a/orte/tools/orte-info/Makefile.am +++ b/orte/tools/orte-info/Makefile.am @@ -45,7 +45,7 @@ if OMPI_INSTALL_BINARIES bin_PROGRAMS = orte-info -dist_pkgdata_DATA = help-orte-info.txt +dist_ompidata_DATA = help-orte-info.txt nodist_man_MANS = $(man_pages) diff --git a/orte/tools/orte-migrate/Makefile.am b/orte/tools/orte-migrate/Makefile.am index 083d1775cd..51b41a8f98 100644 --- a/orte/tools/orte-migrate/Makefile.am +++ b/orte/tools/orte-migrate/Makefile.am @@ -28,7 +28,7 @@ nodist_man_MANS = $(man_pages) # therefore the release date or version may have changed) $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h -dist_pkgdata_DATA = help-orte-migrate.txt +dist_ompidata_DATA = help-orte-migrate.txt endif # OMPI_INSTALL_BINARIES diff --git a/orte/tools/orte-ps/Makefile.am b/orte/tools/orte-ps/Makefile.am index 44ac5d27b6..ce0ff71038 100644 --- a/orte/tools/orte-ps/Makefile.am +++ b/orte/tools/orte-ps/Makefile.am @@ -34,7 +34,7 @@ nodist_man_MANS = $(man_pages) # therefore the release date or version may have changed) $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h -dist_pkgdata_DATA = help-orte-ps.txt +dist_ompidata_DATA = help-orte-ps.txt endif # OMPI_INSTALL_BINARIES diff --git a/orte/tools/orte-restart/Makefile.am b/orte/tools/orte-restart/Makefile.am index 8235b68174..1d70e9ab5f 100644 --- a/orte/tools/orte-restart/Makefile.am +++ b/orte/tools/orte-restart/Makefile.am @@ -36,7 +36,7 @@ nodist_man_MANS = $(man_pages) # therefore the release date or version may have changed) $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h -dist_pkgdata_DATA = help-orte-restart.txt +dist_ompidata_DATA = help-orte-restart.txt endif # OMPI_INSTALL_BINARIES diff --git a/orte/tools/orte-server/Makefile.am b/orte/tools/orte-server/Makefile.am index 67afb91437..94588ed467 100644 --- a/orte/tools/orte-server/Makefile.am +++ b/orte/tools/orte-server/Makefile.am @@ -27,7 +27,7 @@ if OMPI_INSTALL_BINARIES bin_PROGRAMS = orte-server -dist_pkgdata_DATA = help-orte-server.txt +dist_ompidata_DATA = help-orte-server.txt nodist_man_MANS = $(man_pages) diff --git a/orte/tools/orte-top/Makefile.am b/orte/tools/orte-top/Makefile.am index 016d710671..5551c075ad 100644 --- a/orte/tools/orte-top/Makefile.am +++ b/orte/tools/orte-top/Makefile.am @@ -34,7 +34,7 @@ nodist_man_MANS = $(man_pages) # therefore the release date or version may have changed) $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h -dist_pkgdata_DATA = help-orte-top.txt +dist_ompidata_DATA = help-orte-top.txt endif # OMPI_INSTALL_BINARIES diff --git a/orte/tools/orterun/Makefile.am b/orte/tools/orterun/Makefile.am index 87ffa1d371..258be23069 100644 --- a/orte/tools/orterun/Makefile.am +++ b/orte/tools/orterun/Makefile.am @@ -43,7 +43,7 @@ nodist_man_MANS = $(man_pages) # therefore the release date or version may have changed) $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h -dist_pkgdata_DATA = help-orterun.txt +dist_ompidata_DATA = help-orterun.txt endif # OMPI_INSTALL_BINARIES diff --git a/orte/tools/wrappers/Makefile.am b/orte/tools/wrappers/Makefile.am index 32519c2227..9837351c0a 100644 --- a/orte/tools/wrappers/Makefile.am +++ b/orte/tools/wrappers/Makefile.am @@ -22,7 +22,7 @@ if !OPAL_WANT_SCRIPT_WRAPPER_COMPILERS if OMPI_INSTALL_BINARIES -nodist_pkgdata_DATA = \ +nodist_ompidata_DATA = \ ortecc-wrapper-data.txt \ ortec++-wrapper-data.txt diff --git a/orte/util/Makefile.am b/orte/util/Makefile.am index 47ffc1cee2..a1db57afb5 100644 --- a/orte/util/Makefile.am +++ b/orte/util/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.man-page-rules -dist_pkgdata_DATA += util/hostfile/help-hostfile.txt \ +dist_ompidata_DATA += util/hostfile/help-hostfile.txt \ util/dash_host/help-dash-host.txt \ util/help-regex.txt diff --git a/oshmem/Makefile.am b/oshmem/Makefile.am index 65f99ccbfc..e77c3e0ae3 100644 --- a/oshmem/Makefile.am +++ b/oshmem/Makefile.am @@ -61,18 +61,15 @@ liboshmem_la_LDFLAGS = \ headers = noinst_LTLIBRARIES = include_HEADERS = -nobase_oshmem_HEADERS = -dist_pkgdata_DATA = +dist_ompidata_DATA = liboshmem_la_SOURCES += $(headers) nodist_man_MANS = # Conditionally install the header files if WANT_INSTALL_HEADERS -oshmemdir = $(includedir)/oshmem/oshmem -nobase_oshmem_HEADERS += $(headers) -else -oshmemdir = $(includedir) +oshmemdir = $(ompiincludedir)/$(subdir) +nobase_oshmem_HEADERS = $(headers) endif include op/Makefile.am diff --git a/oshmem/include/Makefile.am b/oshmem/include/Makefile.am index eb61daecbc..349735e46f 100644 --- a/oshmem/include/Makefile.am +++ b/oshmem/include/Makefile.am @@ -31,15 +31,8 @@ include_HEADERS += shmem.fh nodist_include_HEADERS = \ shmem.h -if WANT_INSTALL_HEADERS -oshmemdir = $(includedir)/oshmem -nobase_dist_oshmem_HEADERS = $(headers) -nobase_nodist_oshmem_HEADERS = $(nodist_headers) -else -oshmemdir = $(includedir) nobase_dist_noinst_HEADERS = $(headers) nobase_nodist_noinst_HEADERS = $(nodist_headers) -endif distclean-local: diff --git a/oshmem/mca/atomic/Makefile.am b/oshmem/mca/atomic/Makefile.am index 9a1f7c7c95..d6441d9541 100644 --- a/oshmem/mca/atomic/Makefile.am +++ b/oshmem/mca/atomic/Makefile.am @@ -12,21 +12,15 @@ noinst_LTLIBRARIES = libmca_atomic.la libmca_atomic_la_SOURCES = -# header setup -nobase_oshmem_HEADERS = -nobase_nodist_oshmem_HEADERS = - # local files headers = atomic.h libmca_atomic_la_SOURCES += $(headers) $(nodist_headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -nobase_oshmem_HEADERS += $(headers) -nobase_nodist_oshmem_HEADERS += $(nodist_headers) -oshmemdir = $(includedir)/oshmem/oshmem/mca/atomic -else -oshmemdir = $(includedir) +oshmemdir = $(ompiincludedir)/$(subdir) +nobase_oshmem_HEADERS = $(headers) +nobase_nodist_oshmem_HEADERS = $(nodist_headers) endif include base/Makefile.am diff --git a/oshmem/mca/atomic/basic/Makefile.am b/oshmem/mca/atomic/basic/Makefile.am index 350e2d7e3d..7ce1019530 100644 --- a/oshmem/mca/atomic/basic/Makefile.am +++ b/oshmem/mca/atomic/basic/Makefile.am @@ -28,7 +28,7 @@ component_noinst = libmca_atomic_basic.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_atomic_basic_la_SOURCES = $(sources) mca_atomic_basic_la_LDFLAGS = -module -avoid-version diff --git a/oshmem/mca/atomic/mxm/Makefile.am b/oshmem/mca/atomic/mxm/Makefile.am index adda9fe5cb..cbb2e985dd 100644 --- a/oshmem/mca/atomic/mxm/Makefile.am +++ b/oshmem/mca/atomic/mxm/Makefile.am @@ -30,7 +30,7 @@ component_noinst = libmca_atomic_mxm.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_atomic_mxm_la_SOURCES = $(mxm_sources) mca_atomic_mxm_la_LIBADD = $(atomic_mxm_LIBS) diff --git a/oshmem/mca/memheap/Makefile.am b/oshmem/mca/memheap/Makefile.am index b8295ce139..ccc8f6d9c3 100644 --- a/oshmem/mca/memheap/Makefile.am +++ b/oshmem/mca/memheap/Makefile.am @@ -14,11 +14,7 @@ libmca_memheap_la_SOURCES = libmca_memheap_la_LDFLAGS = libmca_memheap_la_LIBADD = -# header setup -nobase_oshmem_HEADERS = -nobase_nodist_oshmem_HEADERS = - -dist_pkgdata_DATA = +dist_ompidata_DATA = # local files headers = memheap.h @@ -26,11 +22,9 @@ libmca_memheap_la_SOURCES += $(headers) $(nodist_headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -nobase_oshmem_HEADERS += $(headers) -nobase_nodist_oshmem_HEADERS += $(nodist_headers) -oshmemdir = $(includedir)/oshmem/oshmem/mca/memheap -else -oshmemdir = $(includedir) +oshmemdir = $(ompiincludedir)/$(subdir) +nobase_oshmem_HEADERS = $(headers) +nobase_nodist_oshmem_HEADERS = $(nodist_headers) endif include base/Makefile.am diff --git a/oshmem/mca/memheap/base/Makefile.am b/oshmem/mca/memheap/base/Makefile.am index 45f68864f9..54433c2eec 100644 --- a/oshmem/mca/memheap/base/Makefile.am +++ b/oshmem/mca/memheap/base/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = $(oshmem_verbs_CPPFLAGS) -dist_pkgdata_DATA += base/help-shmem-mca.txt +dist_ompidata_DATA += base/help-shmem-mca.txt headers += \ base/base.h diff --git a/oshmem/mca/memheap/buddy/Makefile.am b/oshmem/mca/memheap/buddy/Makefile.am index 04abacdb41..b1b4c2d63c 100644 --- a/oshmem/mca/memheap/buddy/Makefile.am +++ b/oshmem/mca/memheap/buddy/Makefile.am @@ -25,7 +25,7 @@ component_noinst = libmca_memheap_buddy.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_memheap_buddy_la_SOURCES = $(buddy_sources) mca_memheap_buddy_la_LDFLAGS = -module -avoid-version diff --git a/oshmem/mca/memheap/ptmalloc/Makefile.am b/oshmem/mca/memheap/ptmalloc/Makefile.am index cd4736f01f..5079033c08 100644 --- a/oshmem/mca/memheap/ptmalloc/Makefile.am +++ b/oshmem/mca/memheap/ptmalloc/Makefile.am @@ -27,7 +27,7 @@ component_noinst = libmca_memheap_ptmalloc.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_memheap_ptmalloc_la_SOURCES = $(ptmalloc_sources) mca_memheap_ptmalloc_la_LDFLAGS = -module -avoid-version diff --git a/oshmem/mca/scoll/Makefile.am b/oshmem/mca/scoll/Makefile.am index 4463de944e..e30fcbfe5b 100644 --- a/oshmem/mca/scoll/Makefile.am +++ b/oshmem/mca/scoll/Makefile.am @@ -12,21 +12,15 @@ noinst_LTLIBRARIES = libmca_scoll.la libmca_scoll_la_SOURCES = -# header setup -nobase_oshmem_HEADERS = -nobase_nodist_oshmem_HEADERS = - # local files headers = scoll.h libmca_scoll_la_SOURCES += $(headers) $(nodist_headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -nobase_oshmem_HEADERS += $(headers) -nobase_nodist_oshmem_HEADERS += $(nodist_headers) -oshmemdir = $(includedir)/oshmem/oshmem/mca/scoll -else -oshmemdir = $(includedir) +oshmemdir = $(ompiincludedir)/$(subdir) +nobase_oshmem_HEADERS = $(headers) +nobase_nodist_oshmem_HEADERS = $(nodist_headers) endif include base/Makefile.am diff --git a/oshmem/mca/scoll/basic/Makefile.am b/oshmem/mca/scoll/basic/Makefile.am index 93fdaaac0c..a378966944 100644 --- a/oshmem/mca/scoll/basic/Makefile.am +++ b/oshmem/mca/scoll/basic/Makefile.am @@ -30,7 +30,7 @@ component_noinst = libmca_scoll_basic.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_scoll_basic_la_SOURCES = $(sources) mca_scoll_basic_la_LDFLAGS = -module -avoid-version diff --git a/oshmem/mca/scoll/fca/Makefile.am b/oshmem/mca/scoll/fca/Makefile.am index 7b4ff3229f..a185ef6cc3 100644 --- a/oshmem/mca/scoll/fca/Makefile.am +++ b/oshmem/mca/scoll/fca/Makefile.am @@ -26,7 +26,7 @@ component_noinst = libmca_scoll_fca.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_scoll_fca_la_SOURCES = $(scoll_fca_sources) mca_scoll_fca_la_LIBADD = $(scoll_fca_LIBS) diff --git a/oshmem/mca/spml/Makefile.am b/oshmem/mca/spml/Makefile.am index 1e500f07fd..2cca488af5 100644 --- a/oshmem/mca/spml/Makefile.am +++ b/oshmem/mca/spml/Makefile.am @@ -12,21 +12,15 @@ noinst_LTLIBRARIES = libmca_spml.la libmca_spml_la_SOURCES = -# header setup -nobase_oshmem_HEADERS = -nobase_nodist_oshmem_HEADERS = - # local files headers = spml.h libmca_spml_la_SOURCES += $(headers) $(nodist_headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -nobase_oshmem_HEADERS += $(headers) -nobase_nodist_oshmem_HEADERS += $(nodist_headers) -oshmemdir = $(includedir)/oshmem/oshmem/mca/spml -else -oshmemdir = $(includedir) +oshmemdir = $(ompiincludedir)/$(subdir) +nobase_oshmem_HEADERS = $(headers) +nobase_nodist_oshmem_HEADERS = $(nodist_headers) endif include base/Makefile.am diff --git a/oshmem/mca/spml/ikrit/Makefile.am b/oshmem/mca/spml/ikrit/Makefile.am index b984c0b704..761ba83859 100644 --- a/oshmem/mca/spml/ikrit/Makefile.am +++ b/oshmem/mca/spml/ikrit/Makefile.am @@ -9,7 +9,7 @@ # $HEADER$ # -dist_pkgdata_DATA = \ +dist_ompidata_DATA = \ help-shmem-spml-ikrit.txt AM_CPPFLAGS = $(spml_ikrit_CPPFLAGS) @@ -28,7 +28,7 @@ component_noinst = libmca_spml_ikrit.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_spml_ikrit_la_SOURCES = $(ikrit_sources) mca_spml_ikrit_la_LIBADD = $(spml_ikrit_LIBS) diff --git a/oshmem/mca/spml/yoda/Makefile.am b/oshmem/mca/spml/yoda/Makefile.am index b55c626d0a..a6211753c8 100644 --- a/oshmem/mca/spml/yoda/Makefile.am +++ b/oshmem/mca/spml/yoda/Makefile.am @@ -9,7 +9,7 @@ # $HEADER$ # -dist_pkgdata_DATA = \ +dist_ompidata_DATA = \ help-shmem-spml-yoda.txt EXTRA_DIST = post_configure.sh @@ -35,7 +35,7 @@ component_noinst = libmca_spml_yoda.la component_install = endif -mcacomponentdir = $(pkglibdir) +mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_spml_yoda_la_SOURCES = $(yoda_sources) mca_spml_yoda_la_LDFLAGS = -module -avoid-version diff --git a/oshmem/runtime/Makefile.am b/oshmem/runtime/Makefile.am index d17ab92624..cc920dfdf7 100644 --- a/oshmem/runtime/Makefile.am +++ b/oshmem/runtime/Makefile.am @@ -9,7 +9,7 @@ # This makefile.am does not stand on its own - it is included from oshmem/Makefile.am -dist_pkgdata_DATA += runtime/help-shmem-runtime.txt +dist_ompidata_DATA += runtime/help-shmem-runtime.txt headers += \ diff --git a/oshmem/shmem/Makefile.am b/oshmem/shmem/Makefile.am index 460a96d42e..03812dc063 100644 --- a/oshmem/shmem/Makefile.am +++ b/oshmem/shmem/Makefile.am @@ -9,4 +9,4 @@ headers += shmem/shmem_api_logger.h \ shmem/shmem_lock.h -dist_pkgdata_DATA += shmem/c/help-shmem-api.txt +dist_ompidata_DATA += shmem/c/help-shmem-api.txt diff --git a/oshmem/shmem/c/Makefile.am b/oshmem/shmem/c/Makefile.am index 404044004a..9d0502d61b 100644 --- a/oshmem/shmem/c/Makefile.am +++ b/oshmem/shmem/c/Makefile.am @@ -64,9 +64,7 @@ headers = liboshmem_c_la_SOURCES = $(OSHMEM_API_SOURCES) if WANT_INSTALL_HEADERS -oshmemdir = $(includedir)/openshmem/oshmem/shmem/c +oshmemdir = $(ompiincludedir)/$(subdir) oshmem_HEADERS = $(headers) -else -oshmemdir = $(includedir) endif diff --git a/oshmem/shmem/c/profile/Makefile.am b/oshmem/shmem/c/profile/Makefile.am index 1b961d2e40..892d2fdb43 100644 --- a/oshmem/shmem/c/profile/Makefile.am +++ b/oshmem/shmem/c/profile/Makefile.am @@ -76,10 +76,8 @@ $(nodist_liboshmem_c_pshmem_la_SOURCES): fi if WANT_INSTALL_HEADERS -oshmemdir = $(includedir)/openshmem/oshmem/shmem/c/profile +oshmemdir = $(ompiincludedir)/$(subdir) oshmem_HEADERS = $(headers) -else -oshmemdir = $(includedir) endif # These files were created by targets above diff --git a/oshmem/shmem/fortran/Makefile.am b/oshmem/shmem/fortran/Makefile.am index 60d2ef7ee0..413205704c 100644 --- a/oshmem/shmem/fortran/Makefile.am +++ b/oshmem/shmem/fortran/Makefile.am @@ -116,9 +116,7 @@ liboshmem_fortran_la_SOURCES = \ shmem_fence_f.c if WANT_INSTALL_HEADERS -oshmemdir = $(includedir)/openshmem/oshmem/shmem/fortran +oshmemdir = $(ompiincludedir)/$(subdir) oshmem_HEADERS = $(headers) -else -oshmemdir = $(includedir) endif diff --git a/oshmem/tools/wrappers/Makefile.am b/oshmem/tools/wrappers/Makefile.am index 1ee380b3b1..5f29f23247 100644 --- a/oshmem/tools/wrappers/Makefile.am +++ b/oshmem/tools/wrappers/Makefile.am @@ -13,7 +13,7 @@ .PHONY: all -dist_pkgdata_DATA = \ +dist_ompidata_DATA = \ shmemcc-wrapper-data.txt \ shmemfort-wrapper-data.txt