Fix mistake that came in via the ompi-agen tree in r23764. The mistake wasn't part of the core autogen upgrade; it was an additional 'bonus' cleanup. Oops. The mistake will always create a set of directories under installdir, even if you do not --with-devel-headers. The set of directories will be empty, but still -- they should not be there at all. This commit fixes that -- the directories are not created at all if you do not --with-devel-headers

This commit was SVN r23801. The following SVN revision numbers were found above: r23764 --> open-mpi/ompi@40a2bfa238
2010-09-24 22:53:28 +00:00 · 2010-09-24 22:53:28 +00:00 · 73bcc4a36b
--- a/ompi/Makefile.am
+++ b/ompi/Makefile.am
@ -130,16 +130,15 @@ libmpi_la_LDFLAGS = \
 headers =
 noinst_LTLIBRARIES =
 include_HEADERS =
-nobase_ompi_HEADERS = 
 dist_pkgdata_DATA =
 libmpi_la_SOURCES += $(headers)
 nodist_man_MANS =

 # Conditionally install the header files

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

 include class/Makefile.am
--- a/ompi/datatype/Makefile.am
+++ b/ompi/datatype/Makefile.am
@ -43,7 +43,7 @@ libdatatype_la_SOURCES = \
 libdatatype_la_LIBADD =

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

 # Conditionally install the header files

-ompidir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/$(subdir)
 ompi_HEADERS = $(headers)
 endif
--- a/ompi/include/Makefile.am
+++ b/ompi/include/Makefile.am
@ -24,8 +24,7 @@
 # note - headers and nodist_headers will go in ${includedir}/openmpi,
 # not ${includedir}/
 headers =
-nodist_headers = \
-	ompi_config.h
+nodist_headers = ompi_config.h

 # Install these in $(includedir)
 include_HEADERS = mpi_portable_platform.h
@ -52,13 +51,14 @@ nodist_include_HEADERS += \
        mpif-config.h
 endif

-ompidir = $(includedir)/openmpi/$(subdir)
+include ompi/Makefile.am
+
+EXTRA_DIST = $(headers)
+
 if WANT_INSTALL_HEADERS 
+ompidir = $(includedir)/openmpi/$(subdir)
 nobase_dist_ompi_HEADERS = $(headers)
 nobase_nodist_ompi_HEADERS = $(nodist_headers)
-else
-nobase_dist_noinst_HEADERS = $(headers)
-nobase_nodist_noinst_HEADERS = $(nodist_headers)
 endif

 # Remove the auto-generated mpi-ext.h file
@ -66,4 +66,3 @@ endif
 distclean-local:
 	rm -f mpi-ext.h

-include ompi/Makefile.am
--- a/ompi/mca/allocator/Makefile.am
+++ b/ompi/mca/allocator/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_allocator.la
 libmca_allocator_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = allocator.h
 libmca_allocator_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/ompi/mca/bml/Makefile.am
+++ b/ompi/mca/bml/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_bml.la
 libmca_bml_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = bml.h
 libmca_bml_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/ompi/mca/btl/Makefile.am
+++ b/ompi/mca/btl/Makefile.am
@ -23,17 +23,14 @@ AM_CPPFLAGS = $(LTDLINCL)
 noinst_LTLIBRARIES = libmca_btl.la
 libmca_btl_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = btl.h
 libmca_btl_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/ompi/mca/coll/Makefile.am
+++ b/ompi/mca/coll/Makefile.am
@ -23,17 +23,14 @@ AM_CPPFLAGS = $(LTDLINCL)
 noinst_LTLIBRARIES = libmca_coll.la
 libmca_coll_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = coll.h
 libmca_coll_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/ompi/mca/common/mx/Makefile.am
+++ b/ompi/mca/common/mx/Makefile.am
@ -73,8 +73,8 @@ libmca_common_mx_noinst_la_LIBADD = $(common_mx_LIBS)

 # Conditionally install the header files

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

--- a/ompi/mca/common/portals/Makefile.am
+++ b/ompi/mca/common/portals/Makefile.am
@ -91,8 +91,8 @@ libmca_common_portals_noinst_la_LIBADD = $(common_portals_LIBS)

 # Conditionally install the header files

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

--- a/ompi/mca/common/sm/Makefile.am
+++ b/ompi/mca/common/sm/Makefile.am
@ -117,8 +117,8 @@ libmca_common_sm_noinst_la_SOURCES = $(libmca_common_sm_la_SOURCES)

 # Conditionally install the header files

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

--- a/ompi/mca/crcp/Makefile.am
+++ b/ompi/mca/crcp/Makefile.am
@ -24,9 +24,6 @@ include $(top_srcdir)/Makefile.man-page-rules
 noinst_LTLIBRARIES = libmca_crcp.la
 libmca_crcp_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = crcp.h
 libmca_crcp_la_SOURCES += $(headers)
@ -41,9 +38,9 @@ EXTRA_DIST = $(nodist_man_MANS:.7=.7in)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h

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

 include base/Makefile.am
--- a/ompi/mca/dpm/Makefile.am
+++ b/ompi/mca/dpm/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_dpm.la
 libmca_dpm_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = dpm.h
 libmca_dpm_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/ompi/mca/io/Makefile.am
+++ b/ompi/mca/io/Makefile.am
@ -23,17 +23,14 @@ AM_CPPFLAGS = $(LTDLINCL)
 noinst_LTLIBRARIES = libmca_io.la
 libmca_io_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = io.h
 libmca_io_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/ompi/mca/mpool/Makefile.am
+++ b/ompi/mca/mpool/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_mpool.la
 libmca_mpool_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = mpool.h
 libmca_mpool_la_SOURCES += $(headers)

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

 dist_pkgdata_DATA =
--- a/ompi/mca/mpool/fake/Makefile.am
+++ b/ompi/mca/mpool/fake/Makefile.am
@ -10,7 +10,6 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Myricom.  All rights reserved.
-#
 # Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
@ -25,10 +24,9 @@ sources = \
 	mpool_fake_module.c \
 	mpool_fake_component.c

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

 # Make the output library in this directory, and name it either
--- a/ompi/mca/mpool/rdma/Makefile.am
+++ b/ompi/mca/mpool/rdma/Makefile.am
@ -25,10 +25,9 @@ sources = \
 	mpool_rdma_module.c \
 	mpool_rdma_component.c

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

 # Make the output library in this directory, and name it either
--- a/ompi/mca/mtl/Makefile.am
+++ b/ompi/mca/mtl/Makefile.am
@ -21,19 +21,15 @@
 noinst_LTLIBRARIES = libmca_mtl.la
 libmca_mtl_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-nobase_nodist_ompi_HEADERS =
-
 # local files
 headers = mtl.h
 libmca_mtl_la_SOURCES += $(headers) $(nodist_headers)

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

 include base/Makefile.am
--- a/ompi/mca/op/Makefile.am
+++ b/ompi/mca/op/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_op.la
 libmca_op_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = op.h
 libmca_op_la_SOURCES += $(headers)

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

 include base/Makefile.include
--- a/ompi/mca/osc/Makefile.am
+++ b/ompi/mca/osc/Makefile.am
@ -26,8 +26,8 @@ headers = osc.h
 libmca_osc_la_SOURCES += $(headers)

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

--- a/ompi/mca/pml/Makefile.am
+++ b/ompi/mca/pml/Makefile.am
@ -21,19 +21,15 @@
 noinst_LTLIBRARIES = libmca_pml.la
 libmca_pml_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-nobase_nodist_ompi_HEADERS =
-
 # local files
 headers = pml.h
 libmca_pml_la_SOURCES += $(headers) $(nodist_headers)

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

 include base/Makefile.am
--- a/ompi/mca/pubsub/Makefile.am
+++ b/ompi/mca/pubsub/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_pubsub.la
 libmca_pubsub_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = pubsub.h
 libmca_pubsub_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/ompi/mca/rcache/Makefile.am
+++ b/ompi/mca/rcache/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_rcache.la
 libmca_rcache_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = rcache.h
 libmca_rcache_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/ompi/mca/topo/Makefile.am
+++ b/ompi/mca/topo/Makefile.am
@ -23,17 +23,14 @@ AM_CPPFLAGS = $(LTDLINCL)
 noinst_LTLIBRARIES = libmca_topo.la
 libmca_topo_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-
 # local files
 headers = topo.h
 libmca_topo_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/ompi/mca/vprotocol/Makefile.am
+++ b/ompi/mca/vprotocol/Makefile.am
@ -14,19 +14,15 @@
 noinst_LTLIBRARIES = libmca_vprotocol.la
 libmca_vprotocol_la_SOURCES =

-# header setup
-nobase_ompi_HEADERS =
-nobase_nodist_ompi_HEADERS =
-
 # local files
 headers = vprotocol.h
 libmca_vprotocol_la_SOURCES += $(headers) $(nodist_headers)

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

 include base/Makefile.am
--- a/ompi/mpi/c/Makefile.am
+++ b/ompi/mpi/c/Makefile.am
@ -372,7 +372,7 @@ endif

 # Conditionally install the header files

-ompidir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/$(subdir)
 ompi_HEADERS = $(headers)
 endif
--- a/ompi/mpi/c/profile/Makefile.am
+++ b/ompi/mpi/c/profile/Makefile.am
@ -363,8 +363,8 @@ $(nodist_libmpi_c_pmpi_la_SOURCES):

 # Conditionally install the header files

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

--- a/ompi/mpi/f77/Makefile.am
+++ b/ompi/mpi/f77/Makefile.am
@ -375,7 +375,7 @@ endif
 # Conditionally install the header files
 #

-ompidir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/$(subdir)
 ompi_HEADERS = $(headers)
 endif
--- a/ompi/mpi/f77/profile/Makefile.am
+++ b/ompi/mpi/f77/profile/Makefile.am
@ -345,8 +345,8 @@ $(nodist_libmpi_f77_pmpi_la_SOURCES):

 # Conditionally install the header files

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

--- a/opal/Makefile.am
+++ b/opal/Makefile.am
@ -63,15 +63,14 @@ libopen_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version)
 # included subdirectory Makefile.am's and appended-to variables
 headers =
 noinst_LTLIBRARIES =
-nobase_opal_HEADERS = 
 dist_pkgdata_DATA =
 libopen_pal_la_SOURCES += $(headers)

 # Conditionally install the header files

-opaldir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
-nobase_opal_HEADERS += $(headers)
+opaldir = $(includedir)/openmpi/$(subdir)
+nobase_opal_HEADERS = $(headers)

 # This is somewhat of a hack -- libltdl is installed by libtoolize,
 # and us installing the header here is slightly less kludgey than
--- a/opal/datatype/Makefile.am
+++ b/opal/datatype/Makefile.am
@ -66,7 +66,7 @@ libdatatype_la_SOURCES = \
 libdatatype_la_LIBADD = libdatatype_reliable.la

 # Conditionally install the header files
-opaldir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
+opaldir = $(includedir)/openmpi/$(subdir)
 opal_HEADERS = $(headers)
 endif
--- a/opal/event/Makefile.am
+++ b/opal/event/Makefile.am
@ -72,7 +72,7 @@ libevent_la_SOURCES = event.c log.c evutil.c $(headers)
 libevent_la_LIBADD = $(objects)
 libevent_la_DEPENDENCIES = $(objects)

-opaldir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
+opaldir = $(includedir)/openmpi/$(subdir)
 opal_HEADERS = $(headers)
 endif
--- a/opal/include/Makefile.am
+++ b/opal/include/Makefile.am
@ -17,23 +17,20 @@
 # $HEADER$
 #

-EXTRA_DIST = CMakeLists.txt
-
 headers = \
 	opal_config_bottom.h \
 	opal_stdint.h \
        opal_portable_platform.h

-nodist_headers = \
-	opal_config.h
-
-opaldir = $(includedir)/openmpi
-if WANT_INSTALL_HEADERS 
-nobase_dist_opal_HEADERS = $(headers)
-nobase_nodist_opal_HEADERS = $(nodist_headers)
-else
-nobase_dist_noinst_HEADERS = $(headers)
-nobase_nodist_noinst_HEADERS = $(nodist_headers)
-endif
+nodist_headers = opal_config.h

 include opal/Makefile.am
+
+EXTRA_DIST = CMakeLists.txt $(headers)
+
+if WANT_INSTALL_HEADERS 
+opaldir = $(includedir)/openmpi
+nobase_dist_opal_HEADERS = $(headers)
+nobase_nodist_opal_HEADERS = $(nodist_headers)
+endif
+
--- a/opal/mca/backtrace/Makefile.am
+++ b/opal/mca/backtrace/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_backtrace.la
 libmca_backtrace_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = backtrace.h
 libmca_backtrace_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/opal/mca/base/Makefile.am
+++ b/opal/mca/base/Makefile.am
@ -54,7 +54,7 @@ libmca_base_la_SOURCES = \

 # Conditionally install the header files

-opaldir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
+opaldir = $(includedir)/openmpi/$(subdir)
 opal_HEADERS = $(headers)
 endif
--- a/opal/mca/carto/Makefile.am
+++ b/opal/mca/carto/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_carto.la
 libmca_carto_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = carto.h
 libmca_carto_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/opal/mca/compress/Makefile.am
+++ b/opal/mca/compress/Makefile.am
@ -16,9 +16,6 @@ include $(top_srcdir)/Makefile.man-page-rules
 noinst_LTLIBRARIES = libmca_compress.la
 libmca_compress_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = compress.h
 libmca_compress_la_SOURCES += $(headers)
@ -29,9 +26,9 @@ libmca_compress_la_SOURCES += $(headers)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h

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

 include base/Makefile.am
--- a/opal/mca/crs/Makefile.am
+++ b/opal/mca/crs/Makefile.am
@ -24,9 +24,6 @@ include $(top_srcdir)/Makefile.man-page-rules
 noinst_LTLIBRARIES = libmca_crs.la
 libmca_crs_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = crs.h
 libmca_crs_la_SOURCES += $(headers)
@ -41,9 +38,9 @@ EXTRA_DIST = $(nodist_man_MANS:.7=.7in)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h

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

 include base/Makefile.am
--- a/opal/mca/if/Makefile.am
+++ b/opal/mca/if/Makefile.am
@ -11,19 +11,14 @@
 noinst_LTLIBRARIES = libmca_if.la
 libmca_if_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = if.h
 libmca_if_la_SOURCES += $(headers)

 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-nobase_opal_HEADERS += $(headers)
 opaldir = $(includedir)/openmpi/opal/mca/if
-else
-opaldir = $(includedir)
+nobase_opal_HEADERS = $(headers)
 endif

 include base/Makefile.am
--- a/opal/mca/installdirs/Makefile.am
+++ b/opal/mca/installdirs/Makefile.am
@ -13,17 +13,14 @@
 noinst_LTLIBRARIES = libmca_installdirs.la
 libmca_installdirs_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = installdirs.h
 libmca_installdirs_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/opal/mca/maffinity/Makefile.am
+++ b/opal/mca/maffinity/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_maffinity.la
 libmca_maffinity_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = maffinity.h maffinity_types.h
 libmca_maffinity_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/opal/mca/memchecker/Makefile.am
+++ b/opal/mca/memchecker/Makefile.am
@ -13,17 +13,14 @@
 noinst_LTLIBRARIES = libmca_memchecker.la
 libmca_memchecker_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = memchecker.h
 libmca_memchecker_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/opal/mca/memcpy/Makefile.am
+++ b/opal/mca/memcpy/Makefile.am
@ -14,20 +14,16 @@
 noinst_LTLIBRARIES = libmca_memcpy.la
 libmca_memcpy_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-nobase_nodist_opal_HEADERS =
-
 # local files
 headers = memcpy.h
 nodist_headers = 
 libmca_memcpy_la_SOURCES += $(headers)

 # Conditionally install the header files
-opaldir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
-nobase_opal_HEADERS += $(headers)
-nobase_nodist_opal_HEADERS += $(nodist_headers)
+opaldir = $(includedir)/openmpi/$(subdir)
+nobase_opal_HEADERS = $(headers)
+nobase_nodist_opal_HEADERS = $(nodist_headers)
 endif

 include base/Makefile.am
--- a/opal/mca/memory/Makefile.am
+++ b/opal/mca/memory/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_memory.la
 libmca_memory_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = memory.h
 libmca_memory_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/opal/mca/paffinity/Makefile.am
+++ b/opal/mca/paffinity/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_paffinity.la
 libmca_paffinity_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = paffinity.h
 libmca_paffinity_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/opal/mca/pstat/Makefile.am
+++ b/opal/mca/pstat/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_pstat.la
 libmca_pstat_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = pstat.h
 libmca_pstat_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/opal/mca/sysinfo/Makefile.am
+++ b/opal/mca/sysinfo/Makefile.am
@ -12,18 +12,15 @@
 noinst_LTLIBRARIES = libmca_sysinfo.la
 libmca_sysinfo_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-
 # local files
 headers = sysinfo.h \
          sysinfo_types.h
 libmca_sysinfo_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/opal/mca/timer/Makefile.am
+++ b/opal/mca/timer/Makefile.am
@ -21,20 +21,16 @@
 noinst_LTLIBRARIES = libmca_timer.la
 libmca_timer_la_SOURCES =

-# header setup
-nobase_opal_HEADERS =
-nobase_nodist_opal_HEADERS =
-
 # local files
 headers = timer.h
 nodist_headers = 
 libmca_timer_la_SOURCES += $(headers)

 # Conditionally install the header files
-opaldir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
-nobase_opal_HEADERS += $(headers)
-nobase_nodist_opal_HEADERS += $(nodist_headers)
+opaldir = $(includedir)/openmpi/$(subdir)
+nobase_opal_HEADERS = $(headers)
+nobase_nodist_opal_HEADERS = $(nodist_headers)
 endif

 include base/Makefile.am
--- a/opal/util/Makefile.am
+++ b/opal/util/Makefile.am
@ -102,7 +102,7 @@ libopalutil_la_DEPENDENCIES = \

 # Conditionally install the header files

-opaldir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
+opaldir = $(includedir)/openmpi/$(subdir)
 opal_HEADERS = $(headers)
 endif
--- a/orte/Makefile.am
+++ b/orte/Makefile.am
@ -44,15 +44,14 @@ libopen_rte_la_LDFLAGS = -version-info $(libopen_rte_so_version)
 # included subdirectory Makefile.am's and appended-to variables
 headers =
 noinst_LTLIBRARIES =
-nobase_orte_HEADERS = 
 dist_pkgdata_DATA =
 libopen_rte_la_SOURCES += $(headers)

 # Conditionally install the header files

-ortedir = $(includedir)/openmpi/$(subdir)
 if WANT_INSTALL_HEADERS
-nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/$(subdir)
+nobase_orte_HEADERS = $(headers)
 endif

 # setup to catch extra files to be included in tarballs
--- a/orte/include/Makefile.am
+++ b/orte/include/Makefile.am
@ -19,16 +19,14 @@
 #

 headers =
-nodist_headers = \
-	orte_config.h
-
-ortedir = $(includedir)/openmpi
-if WANT_INSTALL_HEADERS 
-nobase_dist_orte_HEADERS = $(headers)
-nobase_nodist_orte_HEADERS = $(nodist_headers)
-else
-nobase_dist_noinst_HEADERS = $(headers)
-nobase_nodist_noinst_HEADERS = $(nodist_headers)
-endif
+nodist_headers = orte_config.h

 include orte/Makefile.am
+
+EXTRA_DIST = $(headers)
+
+if WANT_INSTALL_HEADERS 
+ortedir = $(includedir)/openmpi
+nobase_dist_orte_HEADERS = $(headers)
+nobase_nodist_orte_HEADERS = $(nodist_headers)
+endif
--- a/orte/mca/db/Makefile.am
+++ b/orte/mca/db/Makefile.am
@ -13,8 +13,7 @@ AM_CPPFLAGS = $(LTDLINCL)
 noinst_LTLIBRARIES = libmca_db.la
 libmca_db_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
+# pkgdata setup
 dist_pkgdata_DATA =

 # local files
@ -22,9 +21,9 @@ headers = db.h
 libmca_db_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/debugger/Makefile.am
+++ b/orte/mca/debugger/Makefile.am
@ -11,18 +11,15 @@
 noinst_LTLIBRARIES = libmca_debugger.la
 libmca_debugger_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = debugger.h

 libmca_debugger_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/errmgr/Makefile.am
+++ b/orte/mca/errmgr/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_errmgr.la
 libmca_errmgr_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = errmgr.h
 libmca_errmgr_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/ess/Makefile.am
+++ b/orte/mca/ess/Makefile.am
@ -23,8 +23,7 @@ AM_CPPFLAGS = $(LTDLINCL)
 noinst_LTLIBRARIES = libmca_ess.la
 libmca_ess_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
+# pkgdata setup
 dist_pkgdata_DATA =

 # local files
@ -32,9 +31,9 @@ headers = ess.h
 libmca_ess_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/filem/Makefile.am
+++ b/orte/mca/filem/Makefile.am
@ -24,9 +24,6 @@ include $(top_srcdir)/Makefile.man-page-rules
 noinst_LTLIBRARIES = libmca_filem.la
 libmca_filem_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = filem.h
 libmca_filem_la_SOURCES += $(headers)
@ -41,9 +38,9 @@ EXTRA_DIST = $(nodist_man_MANS:.7=.7in)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h

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

 include base/Makefile.am
--- a/orte/mca/grpcomm/Makefile.am
+++ b/orte/mca/grpcomm/Makefile.am
@ -21,9 +21,6 @@
 noinst_LTLIBRARIES = libmca_grpcomm.la
 libmca_grpcomm_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = grpcomm.h \
          grpcomm_types.h
@ -31,9 +28,9 @@ headers = grpcomm.h \
 libmca_grpcomm_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/iof/Makefile.am
+++ b/orte/mca/iof/Makefile.am
@ -23,17 +23,14 @@ AM_CPPFLAGS = $(LTDLINCL)
 noinst_LTLIBRARIES = libmca_iof.la
 libmca_iof_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = iof.h iof_types.h
 libmca_iof_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/notifier/Makefile.am
+++ b/orte/mca/notifier/Makefile.am
@ -21,18 +21,15 @@
 noinst_LTLIBRARIES = libmca_notifier.la
 libmca_notifier_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = notifier.h notifier_event_types.h notifier_event_calls.h

 libmca_notifier_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/odls/Makefile.am
+++ b/orte/mca/odls/Makefile.am
@ -21,8 +21,7 @@
 noinst_LTLIBRARIES = libmca_odls.la
 libmca_odls_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
+# pkgdata setup
 dist_pkgdata_DATA =

 # local files
@ -30,9 +29,9 @@ headers = odls.h odls_types.h
 libmca_odls_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/oob/Makefile.am
+++ b/orte/mca/oob/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_oob.la
 libmca_oob_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = oob.h
 libmca_oob_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/plm/Makefile.am
+++ b/orte/mca/plm/Makefile.am
@ -21,8 +21,7 @@
 noinst_LTLIBRARIES = libmca_plm.la
 libmca_plm_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
+# pkgdata setup
 dist_pkgdata_DATA =

 # local files
@ -30,9 +29,9 @@ headers = plm.h plm_types.h
 libmca_plm_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/ras/Makefile.am
+++ b/orte/mca/ras/Makefile.am
@ -21,8 +21,7 @@
 noinst_LTLIBRARIES = libmca_ras.la
 libmca_ras_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
+# pkgdata setup
 dist_pkgdata_DATA =

 # local files
@ -30,9 +29,9 @@ headers = ras.h ras_types.h
 libmca_ras_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/rmaps/Makefile.am
+++ b/orte/mca/rmaps/Makefile.am
@ -21,17 +21,14 @@
 noinst_LTLIBRARIES = libmca_rmaps.la
 libmca_rmaps_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = rmaps.h rmaps_types.h
 libmca_rmaps_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/rmcast/Makefile.am
+++ b/orte/mca/rmcast/Makefile.am
@ -24,7 +24,6 @@ noinst_LTLIBRARIES = libmca_rmcast.la
 libmca_rmcast_la_SOURCES =

 # header setup
-nobase_orte_HEADERS =
 dist_pkgdata_DATA =

 # local files
@ -32,9 +31,9 @@ headers = rmcast.h rmcast_types.h
 libmca_rmcast_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/rml/Makefile.am
+++ b/orte/mca/rml/Makefile.am
@ -23,17 +23,14 @@ AM_CPPFLAGS = $(LTDLINCL)
 noinst_LTLIBRARIES = libmca_rml.la
 libmca_rml_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = rml.h rml_types.h
 libmca_rml_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/routed/Makefile.am
+++ b/orte/mca/routed/Makefile.am
@ -15,17 +15,14 @@ AM_CPPFLAGS = $(LTDLINCL)
 noinst_LTLIBRARIES = libmca_routed.la
 libmca_routed_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = routed.h routed_types.h
 libmca_routed_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/sensor/Makefile.am
+++ b/orte/mca/sensor/Makefile.am
@ -12,9 +12,6 @@
 noinst_LTLIBRARIES = libmca_sensor.la
 libmca_sensor_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = sensor.h \
          sensor_types.h
@ -22,9 +19,9 @@ headers = sensor.h \
 libmca_sensor_la_SOURCES += $(headers)

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

 include base/Makefile.am
--- a/orte/mca/snapc/Makefile.am
+++ b/orte/mca/snapc/Makefile.am
@ -24,9 +24,6 @@ include $(top_srcdir)/Makefile.man-page-rules
 noinst_LTLIBRARIES = libmca_snapc.la
 libmca_snapc_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = snapc.h
 libmca_snapc_la_SOURCES += $(headers)
@ -41,9 +38,9 @@ EXTRA_DIST = $(nodist_man_MANS:.7=.7in)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h

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

 include base/Makefile.am
--- a/orte/mca/sstore/Makefile.am
+++ b/orte/mca/sstore/Makefile.am
@ -16,9 +16,6 @@ include $(top_srcdir)/Makefile.man-page-rules
 noinst_LTLIBRARIES = libmca_sstore.la
 libmca_sstore_la_SOURCES =

-# header setup
-nobase_orte_HEADERS =
-
 # local files
 headers = sstore.h
 libmca_sstore_la_SOURCES += $(headers)
@ -33,9 +30,9 @@ EXTRA_DIST = $(nodist_man_MANS:.7=.7in)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h

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

 include base/Makefile.am