diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-12-10 12:08:43 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-12-10 12:08:43 +0000 |
| commit | a17343761c9ee3e6507de712971f373dac0cf79d (patch) | |
| tree | e2d24f9d4676f77dd99724b5edd20f934f9ef00a | |
| parent | 88e885f340254f4e85c695b721d2386cb8729ec4 (diff) | |
| download | ATCD-a17343761c9ee3e6507de712971f373dac0cf79d.tar.gz | |
Fri Dec 10 12:03:52 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com>
* ciao/Base/CIAO_Base.mpc:
Another attempt to fix the path to tao_idl3_to_xmi on
installed builds.
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/ciao/Base/CIAO_Base.mpc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index dfe49e6c3e9..a6691d0e748 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Dec 10 12:03:52 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> + + * ciao/Base/CIAO_Base.mpc: + Another attempt to fix the path to tao_idl3_to_xmi on + installed builds. + Thu Dec 9 13:26:48 UTC 2010 Martin Corino <corino_m@remedy.nl> * ciao/Containers/Extension/Extension_Container.cpp: diff --git a/CIAO/ciao/Base/CIAO_Base.mpc b/CIAO/ciao/Base/CIAO_Base.mpc index 8ff9cd537a0..58aa9332a60 100644 --- a/CIAO/ciao/Base/CIAO_Base.mpc +++ b/CIAO/ciao/Base/CIAO_Base.mpc @@ -57,7 +57,7 @@ project(*_install) : install, install_data { } verbatim(gnuace, postinstall) { " cp ../../rules.ciao.GNU $(INSTALL_PREFIX)/share/ciao" -" perl -i -pe's!\\$$[{(]CIAO_ROOT[})]!$(INSTALL_PREFIX)/include!g;' -e'if (/ifndef TAO_IDL3_TO_IDL2\\b/) {print qq!TAO_IDL3_TO_IDL2=$(INSTALL_PREFIX)/share/ciao/bin/tao_idl3_to_idl2\\nTAO_IDL3_TO_IDL2_DEP=\\$$(TAO_IDL3_TO_IDL2)\\$$(EXEEXT)\\n!}' $(INSTALL_PREFIX)/share/ciao/rules.ciao.GNU" +" perl -i -pe's!\\$$[{(]CIAO_ROOT[})]!$(INSTALL_PREFIX)/include!g;' -e'if (/ifndef TAO_IDL3_TO_IDL2\\b/) {print qq!TAO_IDL3_TO_IDL2=$(INSTALL_PREFIX)/share/ciao/bin/tao_idl3_to_idl2\\nTAO_IDL3_TO_IDL2_DEP=\\$$(TAO_IDL3_TO_IDL2)\\$$(EXEEXT)\\n!}' -e'if (/ifndef TAO_IDL3_TO_XMI\\b/) {print qq!TAO_IDL3_TO_XMI=$(INSTALL_PREFIX)/share/ciao/bin/tao_idl3_to_xmi\\nTAO_IDL3_TO_XMI_DEP=\\$$(TAO_IDL3_TO_XMI)\\$$(EXEEXT)\\n!}' $(INSTALL_PREFIX)/share/ciao/rules.ciao.GNU" " echo export CIAO_ROOT=$(INSTALL_PREFIX)/share/ciao> $(INSTALL_PREFIX)/share/ciao/ciao-devel.sh" } } |