Updated installed location of documentation and header files.

10 files changed, 53 insertions, 14 deletions

diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index 25186770861..6cbb9fae704 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
@@ -1,8 +1,12 @@
 // -*- MPC -*-
 project : orbsvcsexe, install, concurrency_serv, naming, utils, svc_utils {
   exename  = tao_cosconcurrency
+
+  specific {
+    install_dir = tao/docs/concurrencysvc
+  }
+
   InstallData_Files {
-    gendir = .
     README
   }
 }
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
index e52e9a807f2..cb473488432 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
@@ -1,8 +1,12 @@
 // -*- MPC -*-
 project : orbsvcsexe, install, naming, event_serv, svc_utils, iortable, messaging_optional, portableserver {
   exename  = tao_cosevent
+
+  specific {
+    install_dir = tao/docs/cosevent
+  }
+
   InstallData_Files {
-    gendir = .
     README
   }
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index b3e34c811f8..66f72fd6aab 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -175,14 +175,20 @@ project(ImR_Activator_Service) : orbsvcsexe, install, acexml, avoids_minimum_cor
 project(tao_imr) : orbsvcsexe, install, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, portableserver, imr_client, messaging, svc_utils {
   install         = $(ACE_ROOT)/bin
   exename  = tao_imr
+
   Source_Files {
     tao_imr.cpp
     tao_imr_i.cpp
   }
+
   idl_files {
   }
+
+  specific {
+    install_dir = tao/docs/implrepo
+  }
+
   InstallData_Files {
-    gendir = tao-imr
     README
   }
 }
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
index fcc9dad1dea..a2a8d8de9bb 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
@@ -1,7 +1,11 @@
 project: namingexe, iortable, install, dslogadmin_serv, valuetype {
   exename   = tao_tls_basic
+
+  specific {
+    install_dir = tao/docs/basic_logging
+  }
+
   InstallData_Files {
-    gendir = tao-log
     README
   }
 }
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index cb892d62c16..087ace3a93d 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
@@ -5,8 +5,12 @@ project : orbsvcsexe, install, naming_serv, imr_client, svc_utils {
     Naming_Server.cpp
     Naming_Service.cpp
   }
+
+  specific {
+    install_dir = tao/docs/naming
+  }
+
   InstallData_Files {
-    gendir = tao-naming
     README
   }
 }
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index 993fac76d8e..731d6735299 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -19,8 +19,12 @@ project(Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monito
   Source_Files {
     Notify_Server.cpp
   }
+
+  specific {
+    install_dir = tao/docs/notification
+  }
+
   InstallData_Files {
-    gendir = tao-notify
     README
   }
 }
diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc
index 94303738196..0ac011e7c1b 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service.mpc
+++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc
@@ -5,8 +5,12 @@ project(Time_Service_Server) : orbsvcsexe, install, time_serv, naming, utils, av
     Server_i.cpp
     Time_Service_Server.cpp
   }
+
+  specific {
+    install_dir = tao/docs/timesvc
+  }
+
   InstallData_Files {
-    gendir = .
     README
   }
 }
@@ -17,8 +21,4 @@ project(Time_Service_Clerk) : orbsvcsexe, install, time_serv, naming, utils, avo
     Clerk_i.cpp
     Time_Service_Clerk.cpp
   }
-  InstallData_Files {
-    gendir = .
-    README
-  }
 }
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
index 3bc4eded25a..1e8942ef415 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
@@ -1,8 +1,12 @@
 // -*- MPC -*-
 project : orbsvcsexe, utils, install, naming, trading_serv {
   exename  = tao_costrading
+
+  specific {
+    install_dir = tao/docs/trading
+  }
+
   InstallData_Files {
-    gendir = tao-trading
     README
   }
 }
diff --git a/TAO/utils/catior/catior.mpc b/TAO/utils/catior/catior.mpc
index edea079c4ad..109cceff1a8 100644
--- a/TAO/utils/catior/catior.mpc
+++ b/TAO/utils/catior/catior.mpc
@@ -8,6 +8,10 @@ project(*lib): tao_output, rtcorba, install, messaging, ziop {
   Source_Files {
     Catior_i.cpp
   }
+
+  specific {
+    install_dir = tao/catior
+  }
 }
 
 project: namingexe, rtcorba, install, messaging, ziop {
@@ -23,8 +27,11 @@ project: namingexe, rtcorba, install, messaging, ziop {
   Header_Files {
   }
 
+  specific {
+    install_dir = tao
+  }
+
   InstallData_Files {
-    gendir = tao-utils
     README.catior
   }
 }
diff --git a/TAO/utils/nslist/nslist.mpc b/TAO/utils/nslist/nslist.mpc
index 0a58a51c85b..c37c7c4c078 100644
--- a/TAO/utils/nslist/nslist.mpc
+++ b/TAO/utils/nslist/nslist.mpc
@@ -22,8 +22,10 @@ project(nslist): namingexe, install, svc_utils, messaging, strategies {
     nslist.cpp
   }
   InstallData_Files {
-    gendir = tao-utils
     README.nslist
   }
+  specific {
+    install_dir = tao
+  }
 }