From 282a8b5e8d63e62cd7d791ff35d8d373239cdcf4 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Sat, 2 Jul 2005 15:13:41 +0000 Subject: [PATCH] More orte Makefile.am updates This commit was SVN r6287. --- orte/class/Makefile.am | 6 ++-- orte/dps/Makefile.am | 6 ++-- orte/include/Makefile.am | 6 ++-- orte/mca/Makefile.am | 32 +++++++++++++++++++ orte/mca/errmgr/Makefile.am | 6 ++-- orte/mca/errmgr/base/Makefile.am | 6 ++-- orte/mca/gpr/Makefile.am | 6 ++-- orte/mca/gpr/base/Makefile.am | 6 ++-- .../gpr/base/data_type_support/Makefile.am | 6 ++-- orte/mca/gpr/base/pack_api_cmd/Makefile.am | 6 ++-- .../gpr/base/unpack_api_response/Makefile.am | 6 ++-- orte/mca/iof/Makefile.am | 6 ++-- orte/mca/iof/base/Makefile.am | 6 ++-- orte/mca/ns/Makefile.am | 6 ++-- orte/mca/ns/base/Makefile.am | 6 ++-- .../mca/ns/base/data_type_support/Makefile.am | 6 ++-- orte/mca/oob/Makefile.am | 6 ++-- orte/mca/oob/base/Makefile.am | 6 ++-- orte/mca/pls/Makefile.am | 6 ++-- orte/mca/pls/base/Makefile.am | 6 ++-- orte/mca/ras/Makefile.am | 6 ++-- orte/mca/ras/base/Makefile.am | 6 ++-- orte/mca/rds/Makefile.am | 6 ++-- orte/mca/rds/base/Makefile.am | 6 ++-- orte/mca/rmaps/Makefile.am | 6 ++-- orte/mca/rmaps/base/Makefile.am | 6 ++-- orte/mca/rmgr/Makefile.am | 6 ++-- orte/mca/rmgr/base/Makefile.am | 6 ++-- .../rmgr/base/data_type_support/Makefile.am | 6 ++-- orte/mca/rml/Makefile.am | 6 ++-- orte/mca/rml/base/Makefile.am | 6 ++-- orte/mca/schema/Makefile.am | 6 ++-- orte/mca/schema/base/Makefile.am | 6 ++-- orte/mca/soh/Makefile.am | 6 ++-- orte/mca/soh/base/Makefile.am | 6 ++-- .../soh/base/data_type_support/Makefile.am | 6 ++-- orte/runtime/Makefile.am | 6 ++-- orte/util/Makefile.am | 6 ++-- 38 files changed, 143 insertions(+), 111 deletions(-) diff --git a/orte/class/Makefile.am b/orte/class/Makefile.am index 6fc823c581..c8c43afc74 100644 --- a/orte/class/Makefile.am +++ b/orte/class/Makefile.am @@ -37,8 +37,8 @@ libclass_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/orte/class -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/class +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/dps/Makefile.am b/orte/dps/Makefile.am index 9f01fa7169..fbc87d25b8 100644 --- a/orte/dps/Makefile.am +++ b/orte/dps/Makefile.am @@ -39,8 +39,8 @@ libdps_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/orte/dps -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/dps +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/include/Makefile.am b/orte/include/Makefile.am index 9ad210f81f..ddd61a1f32 100644 --- a/orte/include/Makefile.am +++ b/orte/include/Makefile.am @@ -23,8 +23,8 @@ noinst_HEADERS = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/orte/include -ompi_HEADERS = $(noinst_HEADERS) +ortedir = $(includedir)/openmpi/orte/include +orte_HEADERS = $(noinst_HEADERS) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/Makefile.am b/orte/mca/Makefile.am index e69de29bb2..a8246c3c84 100644 --- a/orte/mca/Makefile.am +++ b/orte/mca/Makefile.am @@ -0,0 +1,32 @@ +# +# Copyright (c) 2004-2005 The Trustees of Indiana University. +# All rights reserved. +# Copyright (c) 2004-2005 The Trustees of the University of Tennessee. +# All rights reserved. +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# University of Stuttgart. All rights reserved. +# Copyright (c) 2004-2005 The Regents of the University of California. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +include $(top_srcdir)/config/Makefile.options + +SUBDIRS = \ + errmgr \ + gpr \ + iof \ + ns \ + oob \ + pls \ + ras \ + rds \ + rmaps \ + rmgr \ + rml \ + schema \ + soh diff --git a/orte/mca/errmgr/Makefile.am b/orte/mca/errmgr/Makefile.am index b586403e98..2c27e9de88 100644 --- a/orte/mca/errmgr/Makefile.am +++ b/orte/mca/errmgr/Makefile.am @@ -27,8 +27,8 @@ headers = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/errmgr -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/errmgr +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/errmgr/base/Makefile.am b/orte/mca/errmgr/base/Makefile.am index 10bb861d99..e838747ad4 100644 --- a/orte/mca/errmgr/base/Makefile.am +++ b/orte/mca/errmgr/base/Makefile.am @@ -40,8 +40,8 @@ libmca_errmgr_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/errmgr/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/errmgr/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/gpr/Makefile.am b/orte/mca/gpr/Makefile.am index ffd0a68614..0082e51883 100644 --- a/orte/mca/gpr/Makefile.am +++ b/orte/mca/gpr/Makefile.am @@ -27,8 +27,8 @@ headers = gpr.h \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/gpr -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/gpr +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/gpr/base/Makefile.am b/orte/mca/gpr/base/Makefile.am index 70c986b0bc..355f3fa9d3 100644 --- a/orte/mca/gpr/base/Makefile.am +++ b/orte/mca/gpr/base/Makefile.am @@ -39,9 +39,9 @@ libmca_gpr_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/gpr/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/gpr/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/gpr/base/data_type_support/Makefile.am b/orte/mca/gpr/base/data_type_support/Makefile.am index c44f679be6..937f054369 100644 --- a/orte/mca/gpr/base/data_type_support/Makefile.am +++ b/orte/mca/gpr/base/data_type_support/Makefile.am @@ -30,9 +30,9 @@ libmca_gpr_base_data_type_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/gpr/base/data_type_support -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/gpr/base/data_type_support +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/gpr/base/pack_api_cmd/Makefile.am b/orte/mca/gpr/base/pack_api_cmd/Makefile.am index f02861b02f..091b0b57b8 100644 --- a/orte/mca/gpr/base/pack_api_cmd/Makefile.am +++ b/orte/mca/gpr/base/pack_api_cmd/Makefile.am @@ -34,9 +34,9 @@ libmca_gpr_base_pack_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/gpr/base/pack_api_cmd -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/gpr/base/pack_api_cmd +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/gpr/base/unpack_api_response/Makefile.am b/orte/mca/gpr/base/unpack_api_response/Makefile.am index 0b00a19ef6..1dfc9e2cf4 100644 --- a/orte/mca/gpr/base/unpack_api_response/Makefile.am +++ b/orte/mca/gpr/base/unpack_api_response/Makefile.am @@ -35,9 +35,9 @@ libmca_gpr_base_unpack_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/gpr/base/unpack_api_response -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/gpr/base/unpack_api_response +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/iof/Makefile.am b/orte/mca/iof/Makefile.am index 608d249b00..db6c0e1c0a 100644 --- a/orte/mca/iof/Makefile.am +++ b/orte/mca/iof/Makefile.am @@ -26,8 +26,8 @@ headers = iof.h # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/iof -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/iof +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/iof/base/Makefile.am b/orte/mca/iof/base/Makefile.am index 9f02feb121..abec472e4d 100644 --- a/orte/mca/iof/base/Makefile.am +++ b/orte/mca/iof/base/Makefile.am @@ -44,9 +44,9 @@ libmca_iof_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/iof/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/iof/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/ns/Makefile.am b/orte/mca/ns/Makefile.am index a9de97e31e..24a784c975 100644 --- a/orte/mca/ns/Makefile.am +++ b/orte/mca/ns/Makefile.am @@ -28,8 +28,8 @@ headers = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/ns -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/ns +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/ns/base/Makefile.am b/orte/mca/ns/base/Makefile.am index 679842592f..a4e5a829a7 100644 --- a/orte/mca/ns/base/Makefile.am +++ b/orte/mca/ns/base/Makefile.am @@ -47,8 +47,8 @@ libmca_ns_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/ns/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/ns/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/ns/base/data_type_support/Makefile.am b/orte/mca/ns/base/data_type_support/Makefile.am index 5d98659faf..b265a26fc5 100644 --- a/orte/mca/ns/base/data_type_support/Makefile.am +++ b/orte/mca/ns/base/data_type_support/Makefile.am @@ -30,9 +30,9 @@ libmca_ns_base_data_type_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/ns/base/data_type_support -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/ns/base/data_type_support +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/oob/Makefile.am b/orte/mca/oob/Makefile.am index 0d1bed9ca4..f5d6c3c1ac 100644 --- a/orte/mca/oob/Makefile.am +++ b/orte/mca/oob/Makefile.am @@ -28,8 +28,8 @@ headers = oob.h \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/oob -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/oob +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/oob/base/Makefile.am b/orte/mca/oob/base/Makefile.am index cbbb139926..9cb9fd7cfc 100644 --- a/orte/mca/oob/base/Makefile.am +++ b/orte/mca/oob/base/Makefile.am @@ -45,8 +45,8 @@ libmca_oob_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/oob/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/oob/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/pls/Makefile.am b/orte/mca/pls/Makefile.am index 34a6457741..7f5bc0aa26 100644 --- a/orte/mca/pls/Makefile.am +++ b/orte/mca/pls/Makefile.am @@ -26,8 +26,8 @@ headers = pls.h # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/pls -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/pls +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/pls/base/Makefile.am b/orte/mca/pls/base/Makefile.am index 2c0c22c435..cfc5e41879 100644 --- a/orte/mca/pls/base/Makefile.am +++ b/orte/mca/pls/base/Makefile.am @@ -37,9 +37,9 @@ libmca_pls_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/pls/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/pls/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/ras/Makefile.am b/orte/mca/ras/Makefile.am index 049d9f36bb..44e33103e4 100644 --- a/orte/mca/ras/Makefile.am +++ b/orte/mca/ras/Makefile.am @@ -28,8 +28,8 @@ headers = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/ras -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/ras +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/ras/base/Makefile.am b/orte/mca/ras/base/Makefile.am index 285d319c81..f266acd710 100644 --- a/orte/mca/ras/base/Makefile.am +++ b/orte/mca/ras/base/Makefile.am @@ -42,8 +42,8 @@ libmca_ras_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/ras/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/ras/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/rds/Makefile.am b/orte/mca/rds/Makefile.am index 3e275be248..f3d114973c 100644 --- a/orte/mca/rds/Makefile.am +++ b/orte/mca/rds/Makefile.am @@ -28,8 +28,8 @@ headers = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/rds -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/rds +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/rds/base/Makefile.am b/orte/mca/rds/base/Makefile.am index 99376cb8f4..cb33f427f0 100644 --- a/orte/mca/rds/base/Makefile.am +++ b/orte/mca/rds/base/Makefile.am @@ -41,8 +41,8 @@ libmca_rds_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/rds/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/rds/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/rmaps/Makefile.am b/orte/mca/rmaps/Makefile.am index 8cc3f4a1e0..17fa91b8f1 100644 --- a/orte/mca/rmaps/Makefile.am +++ b/orte/mca/rmaps/Makefile.am @@ -28,8 +28,8 @@ headers = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/rmaps -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/rmaps +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/rmaps/base/Makefile.am b/orte/mca/rmaps/base/Makefile.am index f0d4b8d8bf..d1952a5389 100644 --- a/orte/mca/rmaps/base/Makefile.am +++ b/orte/mca/rmaps/base/Makefile.am @@ -41,8 +41,8 @@ libmca_rmaps_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/rmaps/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/rmaps/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/rmgr/Makefile.am b/orte/mca/rmgr/Makefile.am index 76cd0dd89a..fefff94f79 100644 --- a/orte/mca/rmgr/Makefile.am +++ b/orte/mca/rmgr/Makefile.am @@ -28,8 +28,8 @@ headers = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/rmgr -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/rmgr +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/rmgr/base/Makefile.am b/orte/mca/rmgr/base/Makefile.am index c761d4886a..1cce9d8a04 100644 --- a/orte/mca/rmgr/base/Makefile.am +++ b/orte/mca/rmgr/base/Makefile.am @@ -46,8 +46,8 @@ libmca_orte_rmgr_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/rmgr/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/rmgr/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/rmgr/base/data_type_support/Makefile.am b/orte/mca/rmgr/base/data_type_support/Makefile.am index f5a9347452..8ec4552cea 100644 --- a/orte/mca/rmgr/base/data_type_support/Makefile.am +++ b/orte/mca/rmgr/base/data_type_support/Makefile.am @@ -30,9 +30,9 @@ libmca_rmgr_base_data_type_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/rmgr/base/data_type_support -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/rmgr/base/data_type_support +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/rml/Makefile.am b/orte/mca/rml/Makefile.am index 225b313542..fa8b98bfd1 100644 --- a/orte/mca/rml/Makefile.am +++ b/orte/mca/rml/Makefile.am @@ -28,8 +28,8 @@ headers = rml.h \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/rml -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/rml +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/rml/base/Makefile.am b/orte/mca/rml/base/Makefile.am index f2644193c8..1606db069d 100644 --- a/orte/mca/rml/base/Makefile.am +++ b/orte/mca/rml/base/Makefile.am @@ -36,9 +36,9 @@ libmca_rml_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/rml/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/rml/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/schema/Makefile.am b/orte/mca/schema/Makefile.am index 8a08531a9e..6cd320e113 100644 --- a/orte/mca/schema/Makefile.am +++ b/orte/mca/schema/Makefile.am @@ -27,8 +27,8 @@ headers = schema.h \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/schema -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/schema +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/schema/base/Makefile.am b/orte/mca/schema/base/Makefile.am index fcaed3b279..df5fd2c8f3 100644 --- a/orte/mca/schema/base/Makefile.am +++ b/orte/mca/schema/base/Makefile.am @@ -39,9 +39,9 @@ libmca_schema_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/schema/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/schema/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/soh/Makefile.am b/orte/mca/soh/Makefile.am index 0f587d3c38..bb8b7e6bfe 100644 --- a/orte/mca/soh/Makefile.am +++ b/orte/mca/soh/Makefile.am @@ -27,8 +27,8 @@ headers = soh.h \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/soh -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/soh +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/soh/base/Makefile.am b/orte/mca/soh/base/Makefile.am index 0f73310dca..6e21cd78b2 100644 --- a/orte/mca/soh/base/Makefile.am +++ b/orte/mca/soh/base/Makefile.am @@ -44,8 +44,8 @@ libmca_soh_base_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/soh/base -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/soh/base +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/mca/soh/base/data_type_support/Makefile.am b/orte/mca/soh/base/data_type_support/Makefile.am index aaa7b8fda1..69cecd18c4 100644 --- a/orte/mca/soh/base/data_type_support/Makefile.am +++ b/orte/mca/soh/base/data_type_support/Makefile.am @@ -30,9 +30,9 @@ libmca_soh_base_data_type_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/mca/soh/base/data_type_support -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/mca/soh/base/data_type_support +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/runtime/Makefile.am b/orte/runtime/Makefile.am index 8e21c64d0f..037cc157b4 100644 --- a/orte/runtime/Makefile.am +++ b/orte/runtime/Makefile.am @@ -47,8 +47,8 @@ libruntime_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/orte/runtime -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/runtime +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif diff --git a/orte/util/Makefile.am b/orte/util/Makefile.am index acd964e21b..664ff5ef8a 100644 --- a/orte/util/Makefile.am +++ b/orte/util/Makefile.am @@ -40,8 +40,8 @@ liborteutil_la_SOURCES = \ # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/openmpi/orte/util -ompi_HEADERS = $(headers) +ortedir = $(includedir)/openmpi/orte/util +orte_HEADERS = $(headers) else -ompidir = $(includedir) +ortedir = $(includedir) endif