6 files changed, 57 insertions, 1 deletions
diff --git a/ACE/ace/ETCL/ETCL.mpc b/ACE/ace/ETCL/ETCL.mpc
index 34449f00d89..f7753fc00ea 100644
--- a/ACE/ace/ETCL/ETCL.mpc
+++ b/ACE/ace/ETCL/ETCL.mpc
@@ -26,6 +26,10 @@ project(ACE_ETCL) : acelib, install, ace_output {
   Pkgconfig_Files {
     ACE_ETCL.pc.in
   }
+
+  specific {
+    install_dir = ace/ETCL
+  }
 }
 
 project(ACE_ETCL_Parser) : acelib, ace_etcl, install, ace_output {
@@ -53,4 +57,8 @@ project(ACE_ETCL_Parser) : acelib, ace_etcl, install, ace_output {
   Pkgconfig_Files {
     ACE_ETCL_Parser.pc.in
   }
+
+  specific {
+    install_dir = ace/ETCL
+  }
 }
diff --git a/ACE/ace/Monitor_Control/Monitor_Control.mpc b/ACE/ace/Monitor_Control/Monitor_Control.mpc
index f203de08b41..9193a77b281 100644
--- a/ACE/ace/Monitor_Control/Monitor_Control.mpc
+++ b/ACE/ace/Monitor_Control/Monitor_Control.mpc
@@ -34,6 +34,10 @@ project(Monitor_Control) : acelib, ace_etcl_parser, ace_output, install {
     Monitor_Control_utils.h
   }
 
+  specific {
+    install_dir = ace/Monitor_Control
+  }
+
   specific (prop:microsoft) {
     lit_libs += pdh
   }
diff --git a/ACE/ace/QoS/qos.mpc b/ACE/ace/QoS/qos.mpc
index 965b2989d09..9efd51af09e 100644
--- a/ACE/ace/QoS/qos.mpc
+++ b/ACE/ace/QoS/qos.mpc
@@ -11,6 +11,10 @@ project(QoS) : acelib, ace_output, install {
     macros += ACE_HAS_WINSOCK2_GQOS
   }
 
+  specific {
+    install_dir = ace/qos
+  }
+
   pkgconfig_files {
     ACE_QoS.pc.in
   }
diff --git a/ACE/ace/SSL/ssl.mpc b/ACE/ace/SSL/ssl.mpc
index 1b8b5ed7c24..292f938816c 100644
--- a/ACE/ace/SSL/ssl.mpc
+++ b/ACE/ace/SSL/ssl.mpc
@@ -7,6 +7,10 @@ project(SSL) : acelib, ace_output, install, ace_openssl {
   sharedname   = ACE_SSL
   dynamicflags = ACE_SSL_BUILD_DLL
 
+  specific {
+    install_dir = ace/SSL
+  }
+
   pkgconfig_files {
     ACE_SSL.pc.in
   }
diff --git a/ACE/ace/SSL/ssl_for_tao.mpc b/ACE/ace/SSL/ssl_for_tao.mpc
index 54915488d7e..c3eb8e58924 100644
--- a/ACE/ace/SSL/ssl_for_tao.mpc
+++ b/ACE/ace/SSL/ssl_for_tao.mpc
@@ -39,4 +39,8 @@ project(SSL_FOR_TAO) : acelib, ace_output, install, ace_openssl {
   pkgconfig_files {
     ACE_SSL.pc.in
   }
+
+  specific {
+    install_dir = ace/SSL
+  }
 }
diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
index 51cdb14f50b..3c7e81b6349 100644
--- a/ACE/ace/ace.mpc
+++ b/ACE/ace/ace.mpc
@@ -481,6 +481,38 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
   }
 
   Pkgconfig_Files {
-     ACE.pc.in
+    ACE.pc.in
+  }
+
+  InstallData_Files {
+    gendir = bin
+    ../bin/MakeProjectCreator
+    ../bin/DependencyGenerator
+    ../bin/mwc.pl
+    ../bin/mpc.pl
+    ../bin/add_rel_link.sh
+    ../bin/depgen.pl
+  }
+  InstallData_Files {
+    gendir = include
+    ../include/makeinclude
+  }
+  InstallData_Files {
+    gendir = .
+    ../README
+    ../VERSION
+    ../PROBLEM-REPORT-FORM
+    ../NEWS
+    ../COPYING
+    ../AUTHORS
+    ../THANKS
+    ../docs
+  }
+
+  verbatim(gnuace, postinstall) {
+"	perl -i -pe's!\\$$[{(]ACE_ROOT[})]!$(INSTALL_PREFIX)/include!g unless /^\\s*include / || /^INS/' $(INSTALL_PREFIX)/share/ace/include/makeinclude/wrapper_macros.GNU"
+"	perl -i -pe'BEGIN {$$lib = qq($(INSTALL_PREFIX)/$(INSTALL_LIB)); $$lp = qq(-value_project libpaths+=$$lib\\n); $$cl = qq(command_line =)}' -e'if ($$. == 1 && /^$$cl (.*)/ && $$1 !~ /$$lib\\b/) {chomp; print qq($$_ $$lp); $$_ = qq()}' -e'elsif ($$. == 1 && !/^$$cl/) {print qq($$cl $$lp)}' $(INSTALL_PREFIX)/share/ace/bin/MakeProjectCreator/config/MPC.cfg"
+"	perl -i -ne'print unless /^\\s*ARCH\\s*[+?:]?=/' $(INSTALL_PREFIX)/share/ace/include/makeinclude/platform_macros.GNU"
+"	echo export ACE_ROOT=$(INSTALL_PREFIX)/share/ace> $(INSTALL_PREFIX)/share/ace/ace-devel.sh"
   }
 }