ChangeLogTag: Fri Nov 12 20:54:14 2004 J.T. Conklin <jtc@acorntoolworks.com>

13 files changed, 57 insertions, 2 deletions

diff --git a/ACEXML/apps/svcconf/Makefile.am b/ACEXML/apps/svcconf/Makefile.am
index a65f7cf69d0..fb12e5ca99f 100644
--- a/ACEXML/apps/svcconf/Makefile.am
+++ b/ACEXML/apps/svcconf/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ACEXML/apps/svcconf
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
diff --git a/ACEXML/common/Makefile.am b/ACEXML/common/Makefile.am
index c51b8debcc8..6b8d6cb1ef6 100644
--- a/ACEXML/common/Makefile.am
+++ b/ACEXML/common/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ACEXML/common
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
diff --git a/ACEXML/parser/parser/Makefile.am b/ACEXML/parser/parser/Makefile.am
index 1904417b2b3..f8951f268b7 100644
--- a/ACEXML/parser/parser/Makefile.am
+++ b/ACEXML/parser/parser/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ACEXML/parser/parser
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
diff --git a/ChangeLog b/ChangeLog
index 59a6d8b9ffd..d99c73dd1cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Fri Nov 12 20:54:14 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* Makefile.am:
+
+	  Restore conditionalized SUBDIR definition for Kokyu and TAO.
+	  Restore bin_SCRIPT and man_MANS definitions so the ace-config
+	  script and manpage is installed.
+
+	* ACEXML/apps/svcconf/Makefile.am:
+	* ACEXML/common/Makefile.am:
+	* ACEXML/parser/parser/Makefile.am:
+	* ace/Makefile.am:
+	* ace/QoS/Makefile.am:
+	* ace/RMCast/Makefile.am:
+	* ace/SSL/Makefile.am:
+	* ace/TMCast/Makefile.am:
+	* protocols/ace/HTBP/Makefile.am:
+
+	  Restore includedir definitions so headers are installed in the
+	  correct place.
+
 Fri Nov 12 16:35:00 2004  Gary Maxey    <gary.maxey@hp.com>
 
         * ace/config-tandem-nsk-mips-v2.h
@@ -207,9 +228,9 @@ Fri Nov 12 17:23:41 2004  Steve Huston  <shuston@riverace.com>
 
 Sat Nov 13 23:49:57 2004  Kobi Cohen-Arazi  <kobi.cohenarazi@gmail.com>
 
-	* tests/Test_Output.cpp (ACE_Test_Output::close): 
+	* tests/Test_Output.cpp (ACE_Test_Output::close):
 	  Added delete of the stream and setting msg_ostream to 0. That way
-	  when re-initing the stream, it will be recreated. 
+	  when re-initing the stream, it will be recreated.
 
 Fri Nov 12 09:10:28 2004  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/Makefile.am b/Makefile.am
index b059c9ff9d2..02101e372ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,19 @@ SUBDIRS = \
         tests \
         websvcs
 
+if BUILD_KOKYU
+SUBDIRS += Kokyu
+endif
+
+if BUILD_TAO
+SUBDIRS += TAO
+endif
+
+man_MANS = ace-config.1
+
+bin_scripts = ace-config
 
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = foreign
 
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 8afc18baee1..15affa1ba01 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ace
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
diff --git a/ace/QoS/Makefile.am b/ace/QoS/Makefile.am
index a8bb70e6051..a351992a709 100644
--- a/ace/QoS/Makefile.am
+++ b/ace/QoS/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ace/QoS
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
diff --git a/ace/RMCast/Makefile.am b/ace/RMCast/Makefile.am
index 583424190a7..58c23331352 100644
--- a/ace/RMCast/Makefile.am
+++ b/ace/RMCast/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ace/RMCast
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
diff --git a/ace/SSL/Makefile.am b/ace/SSL/Makefile.am
index 682f80a6d8b..3aa2f48fa90 100644
--- a/ace/SSL/Makefile.am
+++ b/ace/SSL/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ace/SSL
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
diff --git a/ace/TMCast/Makefile.am b/ace/TMCast/Makefile.am
index 78b90a7e1c3..cc59bfadef3 100644
--- a/ace/TMCast/Makefile.am
+++ b/ace/TMCast/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ace/TMCast
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
diff --git a/protocols/ace/HTBP/Makefile.am b/protocols/ace/HTBP/Makefile.am
index ce3fb3e2a1a..c110e00114e 100644
--- a/protocols/ace/HTBP/Makefile.am
+++ b/protocols/ace/HTBP/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ace/HTBP
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
diff --git a/protocols/ace/RMCast/Makefile.am b/protocols/ace/RMCast/Makefile.am
index 583424190a7..58c23331352 100644
--- a/protocols/ace/RMCast/Makefile.am
+++ b/protocols/ace/RMCast/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ace/RMCast
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
diff --git a/protocols/ace/TMCast/Makefile.am b/protocols/ace/TMCast/Makefile.am
index 78b90a7e1c3..cc59bfadef3 100644
--- a/protocols/ace/TMCast/Makefile.am
+++ b/protocols/ace/TMCast/Makefile.am
@@ -8,6 +8,8 @@
 ## MPC Command:
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
+includedir = @includedir@/ace/TMCast
+
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)