Correct LIB_PREFIX definition for case if 32-bit binaries are installed to 64-bit...

diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index da984d2ccbd93b7d8d43238d1e7d3a3c7f2c0181..83b4b9257199535c829f553b736b279d0c3257a6 100755 (executable)
--- 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 82f0bea54ad20d1e52d1d2b1168695aac9c566af..4acbaa448a61022c918d24f94a47f7a5f5d92e7b 100755 (executable)
--- 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 54f7c93b2f35147f0d5604361d06fdd8fa38d20b..8fb03dda018089a7b9bfc4cf432d9e71597deed9 100755 (executable)
--- 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 d04fb03510026da748f584f4163987488600bb2b..95d3bce8198817c615df13c0705a5397e45e0fea 100755 (executable)
--- 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 c2687d5034e85d66c0c9bb59c4cf35cdfd0f0f38..1d090d9db35f07877f146d1c08abb1fd57d00bd4 100755 (executable)
--- 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 da670a79805abcfe53cfd2df71b2528c93ba24c6..7b595fa7b781f4b722a504148e512d1561d88406 100755 (executable)
--- 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 df5926b8e8fa780b7bf228043b6071ec7598c6a4..2110aed55777e2c45559b6fd9371dbbd41ea8041 100755 (executable)
--- 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 930114b2b7a05e1f8cb723d946859b8cb78e87d3..b9260e59da35f2980644dbc4648c78d65c80f0ff 100755 (executable)
--- 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 933aa21e1cc204c2a2c79386a81cb0fa62c6ebae..44fa5f00c9f12723f0c159f82e91dfd6a4445f29 100755 (executable)
--- 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 3fa3321ccee22e8dc5d18561e122ae48815da86f..8fd1fdc11c875e62070f1059b479f6dbf01c8a3c 100755 (executable)
--- 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 79157cdd5aa5dee5314a4db1cc6c343552d704ff..75e7c77240c76d04ce9d126e4b3267ce3f392a12 100755 (executable)
--- 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 c54225b8dc0533dd17f61292afd9a2868595c7c0..4aa5e2549ffea74dca1f847b1a487e4ec3e26e24 100755 (executable)
--- 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 c7181c1b09b98e9ae8473914c819cd76a2ad8c11..a214d7e7a3b840317da23498a2e14b20b26702e7 100755 (executable)
--- 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 e3134a69bd248ea3f9d927a07a108192ad8de08a..d01a67bac9e716b41442a7677b6d2838f874e7a4 100755 (executable)
--- 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 71ec528db2373abd3cc3852994f80d18adc715c0..b1c89923a4a945e47fa35c56aa126968a367a372 100755 (executable)
--- 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 68b667ef063656e02b823e39b9fe8113b9732a06..11c25496fe93804032eacea561e79cc355b6abef 100755 (executable)
--- 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 83d634575a29cbf803b91257889167bb4817f0fd..fa49eb4bc37d4b0b7309f9225d5bed28dc2b5f8d 100755 (executable)
--- 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 4480a2957d6f5c449ee11f990698692e07837dab..16d4c300d34a6001cd32abd524467b6f8a5e126b 100755 (executable)
--- 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 11fadbfe3f0b8caf38803707db74edc62fa86684..b4ebde8e7c63cde9e563a54710ce948bd908eff4 100755 (executable)
--- 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 c03f02e19fe6546637c2dd772478f40ff1cc5254..20703eba16ba9a5ee6047661643f570621e7f015 100755 (executable)
--- 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 fa09e4dab20020d64e50b59f12c4c9a27a4b759b..d88dd274c130cca6b5da6b331da2bbeec069344c 100755 (executable)
--- 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 620771b476650174ae009f3839fa5aa397778311..90f3595218d7c06d3fafba28f3bce38945cc8904 100755 (executable)
--- 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 a8cb5a6f66374798080c524695f6d31e579cecc9..7925a9a26feb74f863e594b27a0521be7a8bfdc4 100755 (executable)
--- 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 7061ea2cc8da629a6df24ba61e42ce6a2dbdb90e..4de8ed84029a0b05a3555e1aaa9b76e32b5ba495 100755 (executable)
--- 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 7c6eb26ce7fe2ec7e30649157a8b4b730206fdb8..2f2dc1e53320e00a5c602526e657f1b2d2649e24 100755 (executable)
--- 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 5b0ffdf5fa6fe6bcc8c138c570e5cc85fa4d0048..a466a91e979dbbfab5180a5677f6db775012abf5 100755 (executable)
--- 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 5f7ea1e869071d8cd82f313b6da89461d8baacaf..b9d3e42aadd5a756db504a4f1f4b7508a625801c 100755 (executable)
--- 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 a7e10946209eabc7cbc547c7cb4a24829e4e250a..82628248452c3249369157fc59c2dd09226140d9 100755 (executable)
--- 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