From 5ee42c2a589478b49d29ae8d327a6e917c6f4ee0 Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Thu, 18 Nov 2004 03:53:42 +0000
Subject: [PATCH] * correct the installation paths of a bunch of headers * make
 sure to install the libevent header * make Automake create the sysconf_DATA
 directory before trying to   install the config files

This commit was SVN r3614.
---
 etc/Makefile.am                    |  2 ++
 src/class/Makefile.am              |  6 +++---
 src/event/Makefile.am              | 12 +++++++++++-
 src/mca/allocator/base/Makefile.am |  2 +-
 src/mca/mpool/base/Makefile.am     |  2 +-
 src/mca/ptl/base/Makefile.am       |  2 +-
 src/mca/svc/base/Makefile.am       |  2 +-
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 6258c90ad2..0d21c6003e 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -8,6 +8,8 @@ EXTRA_DIST = \
 		openmpi-default-hostfile \
 		openmpi-mca-params.conf
 
+sysconf_DATA = 
+
 # Steal a little trickery from a generated Makefile to only install
 # lam-bhost.def if one does not already exist at the target.
 
diff --git a/src/class/Makefile.am b/src/class/Makefile.am
index aad23b4778..09ea1a4b98 100644
--- a/src/class/Makefile.am
+++ b/src/class/Makefile.am
@@ -16,7 +16,7 @@ headers = \
 	ompi_list.h \
 	ompi_object.h \
 	ompi_pointer_array.h \
-    ompi_proc_table.h \
+	ompi_proc_table.h \
 	ompi_value_array.h \
 	ompi_rb_tree.h
 
@@ -27,7 +27,7 @@ liblfc_la_SOURCES = \
 	ompi_list.c \
 	ompi_object.c \
 	ompi_pointer_array.c \
-    ompi_proc_table.c \
+	ompi_proc_table.c \
 	ompi_bitmap.c \
 	ompi_value_array.c \
 	ompi_rb_tree.c
@@ -35,7 +35,7 @@ liblfc_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/class
+ompidir = $(includedir)/openmpi/class
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/src/event/Makefile.am b/src/event/Makefile.am
index 8bbd7319fe..4a19cb40f6 100644
--- a/src/event/Makefile.am
+++ b/src/event/Makefile.am
@@ -37,6 +37,16 @@ noinst_LTLIBRARIES = libevent.la
 objects = $(OMPI_LIBEVENT_SOURCES:.c=.lo)
 
 # OMPI: Changed to libevent_la_*
-libevent_la_SOURCES = event.c event.h
+headers = event.h
+
+libevent_la_SOURCES = event.c $(headers)
 libevent_la_LIBADD = $(objects)
 libevent_la_DEPENDENCIES = $(objects)
+
+
+if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/event
+ompi_HEADERS = $(headers)
+else
+ompidir = $(includedir)
+endif
diff --git a/src/mca/allocator/base/Makefile.am b/src/mca/allocator/base/Makefile.am
index e39c0f2f5e..d8574c6b29 100644
--- a/src/mca/allocator/base/Makefile.am
+++ b/src/mca/allocator/base/Makefile.am
@@ -23,7 +23,7 @@ libmca_allocator_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/mca/allocator/base
+ompidir = $(includedir)/openmpi/mca/allocator/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/src/mca/mpool/base/Makefile.am b/src/mca/mpool/base/Makefile.am
index c55e84f10b..3cf2e8253f 100644
--- a/src/mca/mpool/base/Makefile.am
+++ b/src/mca/mpool/base/Makefile.am
@@ -25,7 +25,7 @@ libmca_mpool_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/mca/mpool/base
+ompidir = $(includedir)/openmpi/mca/mpool/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/src/mca/ptl/base/Makefile.am b/src/mca/ptl/base/Makefile.am
index d36d21f4eb..63115064f0 100644
--- a/src/mca/ptl/base/Makefile.am
+++ b/src/mca/ptl/base/Makefile.am
@@ -35,7 +35,7 @@ libmca_ptl_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/mca/ptl/base
+ompidir = $(includedir)/openmpi/mca/ptl/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/src/mca/svc/base/Makefile.am b/src/mca/svc/base/Makefile.am
index dcdaca41a1..2cbd662fcf 100644
--- a/src/mca/svc/base/Makefile.am
+++ b/src/mca/svc/base/Makefile.am
@@ -24,7 +24,7 @@ libmca_svc_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/mca/svc/base
+ompidir = $(includedir)/openmpi/mca/svc/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)