spns #29664: omniORB: fix python path

[tools/sat_salome.git] / products / compil_scripts / PyFMI-2.5.sh

diff --git a/products/compil_scripts/PyFMI-2.5.sh b/products/compil_scripts/PyFMI-2.5.sh
index 09004f849862d8e88f449ed043c680d134ac7be2..fcc9e022047902c0aaa4958dc4acb215927f9af0 100755 (executable)
--- a/products/compil_scripts/PyFMI-2.5.sh
+++ b/products/compil_scripts/PyFMI-2.5.sh
@@ -13,10 +13,10 @@ cd $BUILD_DIR
 cp -R $SOURCE_DIR/* .
 
 rm -f $BUILD_DIR/src/pyfmi/*.c
-mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages
+#mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages
 export PATH=$(pwd)/bin:$PATH
 export PYTHONPATH=$(pwd):$PYTHONPATH
-export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH
+#export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH
 
 echo
 echo "*** build with $PYTHONBIN"
@@ -29,12 +29,18 @@ fi
 
 echo
 echo "*** install with $PYTHONBIN"
-$PYTHONBIN setup.py install --prefix=$PRODUCT_INSTALL --fmil-home=$PRODUCT_INSTALL
+$PYTHONBIN setup.py install --prefix=$PRODUCT_INSTALL --fmil-home=$FMIL_HOME
 if [ $? -ne 0 ]
 then
     echo "ERROR on install"
     exit 3
 fi
 
+# ensure that lib is used
+if [ -d "$PRODUCT_INSTALL/lib64" ]; then
+    echo "WARNING: renaming lib64 directory to lib"
+    mv $PRODUCT_INSTALL/lib64 $PRODUCT_INSTALL/lib
+fi
+
 echo
 echo "########## END"