From 7f0cbe759cef71e0f698c0f8e52caa1cc0868126 Mon Sep 17 00:00:00 2001
From: akl <akl@opencascade.com>
Date: Mon, 27 Aug 2007 13:47:55 +0000
Subject: [PATCH] Fix problem of collecting 'omniORB' environment.

---
 config_files/omniORB-4.0.6.sh | 4 +++-
 config_files/omniORB-4.0.7.sh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config_files/omniORB-4.0.6.sh b/config_files/omniORB-4.0.6.sh
index d3a6fd7..57c05bd 100755
--- a/config_files/omniORB-4.0.6.sh
+++ b/config_files/omniORB-4.0.6.sh
@@ -49,9 +49,11 @@ export PATH=\$OMNIORBDIR/bin:\$PATH
 export LD_LIBRARY_PATH=\$OMNIORBDIR/lib:\$LD_LIBRARY_PATH 
 ##
 EOF
-cat > ${PRODUCT_DIR}/.omniORB.cfg <<EOF
+if [ $PROCEDURE != "try_preinstalled" ] && [ -w ${PRODUCT_DIR} ] ; then
+    cat > ${PRODUCT_DIR}/.omniORB.cfg <<EOF
 InitRef = NameService=corbaname::`hostname`:2810
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
diff --git a/config_files/omniORB-4.0.7.sh b/config_files/omniORB-4.0.7.sh
index d9edd27..d4aac1c 100755
--- a/config_files/omniORB-4.0.7.sh
+++ b/config_files/omniORB-4.0.7.sh
@@ -54,9 +54,11 @@ export PATH=\$OMNIORBDIR/bin:\$PATH
 export LD_LIBRARY_PATH=\$OMNIORBDIR/lib:\$LD_LIBRARY_PATH 
 ##
 EOF
-cat > ${PRODUCT_DIR}/.omniORB.cfg <<EOF
+if [ $PROCEDURE != "try_preinstalled" ] && [ -w ${PRODUCT_DIR} ] ; then
+    cat > ${PRODUCT_DIR}/.omniORB.cfg <<EOF
 InitRef = NameService=corbaname::`hostname`:2810
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
-- 
2.39.2