From 34196d3506a461913913a579680590ae8cfa8611 Mon Sep 17 00:00:00 2001
From: akl <akl@opencascade.com>
Date: Thu, 28 Feb 2008 11:08:20 +0000
Subject: [PATCH] Correct LIB_PREFIX definition for case if 32-bit binaries are
 installed to 64-bit platform and vice versa.

---
 config_files/BLSURFPLUGIN.sh   | 10 ++++++----
 config_files/CALCULATOR.sh     | 10 ++++++----
 config_files/COMPONENT.sh      | 10 ++++++----
 config_files/FILTER.sh         | 10 ++++++----
 config_files/GEOM.sh           | 10 ++++++----
 config_files/GHS3DPLUGIN.sh    | 10 ++++++----
 config_files/GHS3DPRLPLUGIN.sh | 10 ++++++----
 config_files/GUI.sh            | 10 ++++++----
 config_files/HELLO.sh          | 10 ++++++----
 config_files/HexoticPLUGIN.sh  | 10 ++++++----
 config_files/KERNEL.sh         | 10 ++++++----
 config_files/LIGHT.sh          | 10 ++++++----
 config_files/MED.sh            | 10 ++++++----
 config_files/MULTIPR.sh        | 10 ++++++----
 config_files/NETGENPLUGIN.sh   | 10 ++++++----
 config_files/PYCALCULATOR.sh   | 10 ++++++----
 config_files/PYHELLO.sh        | 10 ++++++----
 config_files/RANDOMIZER.sh     | 10 ++++++----
 config_files/SIERPINSKY.sh     | 10 ++++++----
 config_files/SMESH.sh          | 10 ++++++----
 config_files/SUPERV.sh         | 10 ++++++----
 config_files/VISU.sh           | 10 ++++++----
 config_files/YACS.sh           | 10 ++++++----
 config_files/blsurf-2.7.12.sh  | 10 ++++++----
 config_files/common.sh         | 13 ++++++++-----
 config_files/omniORB-4.1.0.sh  |  8 ++++++--
 config_files/sip-4.7.3.sh      | 16 ++++++++++------
 config_files/xdata-0.5.52.sh   |  8 ++++++--
 28 files changed, 174 insertions(+), 111 deletions(-)

diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index da984d2..83b4b92 100755
--- a/config_files/BLSURFPLUGIN.sh
+++ b/config_files/BLSURFPLUGIN.sh
@@ -33,10 +33,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh
index 82f0bea..4acbaa4 100755
--- a/config_files/CALCULATOR.sh
+++ b/config_files/CALCULATOR.sh
@@ -33,10 +33,12 @@ return 1
 
 print_env_bin(){
 
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh
index 54f7c93..8fb03dd 100755
--- a/config_files/COMPONENT.sh
+++ b/config_files/COMPONENT.sh
@@ -33,10 +33,12 @@ return 1
 
 print_env_bin(){
 
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
diff --git a/config_files/FILTER.sh b/config_files/FILTER.sh
index d04fb03..95d3bce 100755
--- a/config_files/FILTER.sh
+++ b/config_files/FILTER.sh
@@ -31,10 +31,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh
index c2687d5..1d090d9 100755
--- a/config_files/GEOM.sh
+++ b/config_files/GEOM.sh
@@ -32,10 +32,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh
index da670a7..7b595fa 100755
--- a/config_files/GHS3DPLUGIN.sh
+++ b/config_files/GHS3DPLUGIN.sh
@@ -34,10 +34,12 @@ return 1
 
 print_env_bin(){
 
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh
index df5926b..2110aed 100755
--- a/config_files/GHS3DPRLPLUGIN.sh
+++ b/config_files/GHS3DPRLPLUGIN.sh
@@ -31,10 +31,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/GUI.sh b/config_files/GUI.sh
index 930114b..b9260e5 100755
--- a/config_files/GUI.sh
+++ b/config_files/GUI.sh
@@ -32,10 +32,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh
index 933aa21..44fa5f0 100755
--- a/config_files/HELLO.sh
+++ b/config_files/HELLO.sh
@@ -31,10 +31,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh
index 3fa3321..8fd1fdc 100755
--- a/config_files/HexoticPLUGIN.sh
+++ b/config_files/HexoticPLUGIN.sh
@@ -31,10 +31,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh
index 79157cd..75e7c77 100755
--- a/config_files/KERNEL.sh
+++ b/config_files/KERNEL.sh
@@ -32,10 +32,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh
index c54225b..4aa5e25 100755
--- a/config_files/LIGHT.sh
+++ b/config_files/LIGHT.sh
@@ -31,10 +31,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/MED.sh b/config_files/MED.sh
index c7181c1..a214d7e 100755
--- a/config_files/MED.sh
+++ b/config_files/MED.sh
@@ -32,10 +32,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/MULTIPR.sh b/config_files/MULTIPR.sh
index e3134a6..d01a67b 100755
--- a/config_files/MULTIPR.sh
+++ b/config_files/MULTIPR.sh
@@ -31,10 +31,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh
index 71ec528..b1c8992 100755
--- a/config_files/NETGENPLUGIN.sh
+++ b/config_files/NETGENPLUGIN.sh
@@ -33,10 +33,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh
index 68b667e..11c2549 100755
--- a/config_files/PYCALCULATOR.sh
+++ b/config_files/PYCALCULATOR.sh
@@ -32,10 +32,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh
index 83d6345..fa49eb4 100755
--- a/config_files/PYHELLO.sh
+++ b/config_files/PYHELLO.sh
@@ -31,10 +31,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/RANDOMIZER.sh b/config_files/RANDOMIZER.sh
index 4480a29..16d4c30 100755
--- a/config_files/RANDOMIZER.sh
+++ b/config_files/RANDOMIZER.sh
@@ -31,10 +31,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/SIERPINSKY.sh b/config_files/SIERPINSKY.sh
index 11fadbf..b4ebde8 100755
--- a/config_files/SIERPINSKY.sh
+++ b/config_files/SIERPINSKY.sh
@@ -31,10 +31,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh
index c03f02e..20703eb 100755
--- a/config_files/SMESH.sh
+++ b/config_files/SMESH.sh
@@ -32,10 +32,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/SUPERV.sh b/config_files/SUPERV.sh
index fa09e4d..d88dd27 100755
--- a/config_files/SUPERV.sh
+++ b/config_files/SUPERV.sh
@@ -32,10 +32,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/VISU.sh b/config_files/VISU.sh
index 620771b..90f3595 100755
--- a/config_files/VISU.sh
+++ b/config_files/VISU.sh
@@ -32,10 +32,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index a8cb5a6..7925a9a 100755
--- a/config_files/YACS.sh
+++ b/config_files/YACS.sh
@@ -31,10 +31,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
diff --git a/config_files/blsurf-2.7.12.sh b/config_files/blsurf-2.7.12.sh
index 7061ea2..4de8ed8 100755
--- a/config_files/blsurf-2.7.12.sh
+++ b/config_files/blsurf-2.7.12.sh
@@ -19,10 +19,12 @@ return 0
 
 print_env_bin()
 {
-if test `uname -m` = "x86_64" ; then
-LIB_PREFIX=64
-else
-LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM 
diff --git a/config_files/common.sh b/config_files/common.sh
index 7c6eb26..2f2dc1e 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -700,13 +700,16 @@ if [ "$l" != "X" ] ; then
 	mv -f $l"_" $l
     fi
     # 4. process VTK dependencies
-    if test `uname -m` = "x86_64" ; then
-    vtkdir=`printenv VTKHOME`/lib64/vtk-5.0
-    vtkldir=`printenv VTKHOME`/lib64
+    vtkpath=`printenv VTKHOME`
+    if [ `uname -m` = "x86_64" ] && [ -d ${vtkpath}/lib64 ] ; then
+	LIB_PREFIX=64
+    elif [ -d ${vtkpath}/lib ] ; then
+	LIB_PREFIX=""
     else
-    vtkdir=`printenv VTKHOME`/lib/vtk-5.0
-    vtkldir=`printenv VTKHOME`/lib
+	LIB_PREFIX=64
     fi
+    vtkldir=${vtkpath}/lib${LIB_PREFIX}
+    vtkdir=${vtkldir}/vtk-5.0
     if [ -n "${VTKHOME}" ] && [ -d "${vtkdir}" ] && [ -d "${vtkldir}" ] ; then
 	# echo $l $VTKHOME $vtkdir
 	sed -e "s%-L[^[:space:]]*VTK[^[:space:]]*/\(lib\|lib64\)/vtk\-5\.0%-L${vtkdir}%g" \
diff --git a/config_files/omniORB-4.1.0.sh b/config_files/omniORB-4.1.0.sh
index 5b0ffdf..a466a91 100755
--- a/config_files/omniORB-4.1.0.sh
+++ b/config_files/omniORB-4.1.0.sh
@@ -41,8 +41,12 @@ return 0
 print_env_bin()
 {
 
-if test `uname -m` = "x86_64" ; then
-export OMNI_LIB_PREFIX="64"
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    OMNI_LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    OMNI_LIB_PREFIX=""
+else 
+    OMNI_LIB_PREFIX=64
 fi
 
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
diff --git a/config_files/sip-4.7.3.sh b/config_files/sip-4.7.3.sh
index 5f7ea1e..b9d3e42 100755
--- a/config_files/sip-4.7.3.sh
+++ b/config_files/sip-4.7.3.sh
@@ -29,10 +29,12 @@ return 1
 
 print_env_bin()
 {
-if test `uname -m` = "x86_64" ; then
-LIB_PREFIX=64
-else
-LIB_PREFIX=""
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
@@ -122,10 +124,12 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 # modify sipconfig.py file
 if [ -n "${PYTHONHOME}" ] && [ -n "${QTDIR}" ] ; then
-    if test `uname -m` = "x86_64" ; then
+    if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
 	LIB_PREFIX=64
-    else
+    elif [ -d ${PRODUCT_DIR}/lib ] ; then 
 	LIB_PREFIX=""
+    else 
+	LIB_PREFIX=64
     fi
     cd ${PRODUCT_DIR}/lib${LIB_PREFIX}/python${PYTHON_VERSION}/site-packages
     python_version=`python -V 2>&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'`
diff --git a/config_files/xdata-0.5.52.sh b/config_files/xdata-0.5.52.sh
index a7e1094..8262824 100755
--- a/config_files/xdata-0.5.52.sh
+++ b/config_files/xdata-0.5.52.sh
@@ -19,8 +19,12 @@ return 0
 
 print_env_bin()
 {
-if test `uname -m` = "x86_64" ; then
-export PYTHON_LIB_PREFIX=64
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    PYTHON_LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    PYTHON_LIB_PREFIX=""
+else 
+    PYTHON_LIB_PREFIX=64
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM 
-- 
2.39.2