Fix problem of collecting 'omniORB' environment.

diff --git a/config_files/omniORB-4.0.6.sh b/config_files/omniORB-4.0.6.sh
index d3a6fd773eb717801917ece78af640c8037a982f..57c05bdb2dd06ba8c60db1625d88101c711b9213 100755 (executable)
--- 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 d9edd27fd35d0432139be4d1f07788e5ca66cf3f..d4aac1c4c8d6c8ec73e0e7a769e1443fd4e62bf2 100755 (executable)
--- 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}"
 }