From a19f87c6eb2296b355339ad7d016471517003c88 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Thu, 7 Jan 2016 14:43:03 +0900 Subject: [PATCH 1/2] pmix: do not include automatically generated include/private/autogen/config.h into dist tarball Thanks Siegmar Gross for the initial report of this issue (back-ported from commit open-mpi/ompi@73daf58ee5f230b58291beb0563a50dc21b0b69e) --- opal/mca/pmix/pmix112/pmix/include/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/opal/mca/pmix/pmix112/pmix/include/Makefile.am b/opal/mca/pmix/pmix112/pmix/include/Makefile.am index fba806a158..a31add0d95 100644 --- a/opal/mca/pmix/pmix112/pmix/include/Makefile.am +++ b/opal/mca/pmix/pmix112/pmix/include/Makefile.am @@ -1,5 +1,7 @@ # # Copyright 2015 Intel, Inc. All rights reserved +# Copyright 2016 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # # $COPYRIGHT$ # @@ -25,8 +27,7 @@ headers += \ include/private/pmix_socket_errno.h \ include/private/pmix_stdint.h \ include/private/prefetch.h \ - include/private/types.h \ - include/private/autogen/config.h + include/private/types.h include_pmixdir = $(includedir)/pmix include_pmix_HEADERS = \ include/pmix/rename.h \ @@ -37,6 +38,7 @@ include_pmix_autogen_HEADERS = \ include/pmix/autogen/pmix_config_top.h \ include/pmix/autogen/pmix_config_bottom.h nodist_include_pmix_autogen_HEADERS = \ - include/pmix/autogen/config.h + include/pmix/autogen/config.h \ + include/private/autogen/config.h endif ! PMIX_EMBEDDED_MODE From 0dcaa31200b286fe901465c865f657b25270890a Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Thu, 28 Jan 2016 11:42:03 +0900 Subject: [PATCH 2/2] pmix: fix Makefile.am to correctly exclude autogenerated file from tarball (back-ported from pmix/master@73daf58ee5f230b58291beb0563a50dc21b0b69e) (cherry picked from commit open-mpi/ompi@f5a53b5f1e553b89a5d1ebc8d13acee099f4a3c0) --- opal/mca/pmix/pmix112/pmix/include/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opal/mca/pmix/pmix112/pmix/include/Makefile.am b/opal/mca/pmix/pmix112/pmix/include/Makefile.am index a31add0d95..296a0ce675 100644 --- a/opal/mca/pmix/pmix112/pmix/include/Makefile.am +++ b/opal/mca/pmix/pmix112/pmix/include/Makefile.am @@ -38,7 +38,9 @@ include_pmix_autogen_HEADERS = \ include/pmix/autogen/pmix_config_top.h \ include/pmix/autogen/pmix_config_bottom.h nodist_include_pmix_autogen_HEADERS = \ - include/pmix/autogen/config.h \ + include/pmix/autogen/config.h +include_private_autogendir = $(includedir)/private/autogen +nodist_include_private_autogen_HEADERS = \ include/private/autogen/config.h endif ! PMIX_EMBEDDED_MODE