summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-01-23 16:59:04 +0000
committerstanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-01-23 16:59:04 +0000
commitec2b28b6cc71136bb5de7e4dc05e6a84f6929bed (patch)
tree46b8a16dfb0e433d9565db635a960f0384287895
parentda3a85a44115149ee79f67eb5213756564d22d8c (diff)
downloadATCD-ec2b28b6cc71136bb5de7e4dc05e6a84f6929bed.tar.gz
Changed back to original target directory for building Naming Service
executables.
-rw-r--r--TAO/OCI_RE_ChangeLog7
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.mpc3
2 files changed, 7 insertions, 3 deletions
diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index b8a5bc53fac..5927a944839 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 23 16:55:34 UTC 2013 Kevin Stanley <stanleyk@ociweb.com>
+
+ * orbsvcs/Naming_Service/Naming_Service.mpc:
+
+ Removed install to $ACE_ROOT/bin to revert back to how
+ Naming Service was previously.
+
Wed Jan 23 00:05:57 UTC 2013 Phillip LaBanca <labancap@ociweb.com>
* utils/nslist/nslist.cpp:
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index 850ef615fba..cd4cb809387 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
@@ -2,7 +2,6 @@
// $Id$
project : orbsvcsexe, install, naming_serv, imr_client, svc_utils {
- install = $(ACE_ROOT)/bin
exename = tao_cosnaming
Source_Files {
Naming_Server.cpp
@@ -11,7 +10,6 @@ project : orbsvcsexe, install, naming_serv, imr_client, svc_utils {
}
project (FT_Naming_Service) : orbsvcsexe, install, ft_naming_serv, naming_serv, imr_client, svc_utils {
- install = $(ACE_ROOT)/bin
exename = tao_ft_naming
Header_Files {
FT_Naming_Service.h
@@ -25,7 +23,6 @@ project (FT_Naming_Service) : orbsvcsexe, install, ft_naming_serv, naming_serv,
project(NT_Naming_Service) : orbsvcsexe, install, naming_serv, svc_utils {
requires += winnt
- install = $(ACE_ROOT)/bin
exename = tao_nt_cosnaming
Source_Files {
Naming_Service.cpp