merge from master

[tools/sat_salome.git] / products / compil_scripts / openturns-1.19.sh

diff --git a/products/compil_scripts/openturns-1.19.sh b/products/compil_scripts/openturns-1.19.sh
index 2f38a1dec76ec370a248db0ed19a563db14a17f3..1fc4f1237e95d7055a98c29fcdf73ce24d30dd76 100755 (executable)
--- a/products/compil_scripts/openturns-1.19.sh
+++ b/products/compil_scripts/openturns-1.19.sh
@@ -6,7 +6,7 @@ echo "##########################################################################
 
 # we don't install in python directory -> modify environment as described in INSTALL file
 
-mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
+#mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
 export PATH=$(pwd)/bin:$PATH
 export PYTHONPATH=$(pwd):$PYTHONPATH
 export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
@@ -109,6 +109,7 @@ fi
 echo
 echo "*** cmake" $CMAKE_OPTIONS
 
+rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR/openturns
 mkdir -p  $BUILD_DIR/cache/pip
 cd  $BUILD_DIR/openturns
@@ -139,11 +140,18 @@ fi
 
 echo
 echo "*** check installation"
+if [! -d "${PRODUCT_INSTALL}/lib" ]; then
+    mkdir -p ${PRODUCT_INSTALL}/lib
+fi
 
-if [ -d "${PRODUCT_INSTALL}/lib64" ]
-then
-    mv ${PRODUCT_INSTALL}/lib64/* ${PRODUCT_INSTALL}/lib
+if [ -d "${PRODUCT_INSTALL}/lib64" ]; then
+    echo "WARNING: moving lib64 to lib"
+    mv ${PRODUCT_INSTALL}/lib64/* ${PRODUCT_INSTALL}/lib/
     rmdir ${PRODUCT_INSTALL}/lib64
+elif [ -d "${PRODUCT_INSTALL}/local/lib64" ]; then
+    echo "WARNING: moving local/lib64 to lib"
+    mv ${PRODUCT_INSTALL}/local/lib64/* ${PRODUCT_INSTALL}/lib/
+    rmdir ${PRODUCT_INSTALL}/local/lib64
 fi
 
 if [[ -d "${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/dist-packages" ]]; then
@@ -204,7 +212,7 @@ if [[ -d "$SOURCE_DIR/otfftw-0.12" ]]; then
             CMAKE_EXTRA_OPTIONS+=" -DBUILD_DOC=OFF"
         elif [[ $k == "otmorris" ]]; then
             case $LINUX_DISTRIBUTION in
-                DB*|FD*)
+                DB*|FD*|UB*)
                     echo "WARNING: switching OFF documentation build"
                     CMAKE_EXTRA_OPTIONS+=" -DBUILD_DOC=OFF"
                     CMAKE_EXTRA_OPTIONS+=" -DUSE_SPHINX=OFF" # missing package to be installed.
@@ -212,7 +220,7 @@ if [[ -d "$SOURCE_DIR/otfftw-0.12" ]]; then
             esac
         elif [[ $k == "otrobopt" ]]; then
             case $LINUX_DISTRIBUTION in
-                DB*|FD*)
+                DB*|FD*|UB*)
                     echo "WARNING: switching OFF documentation build"
                     CMAKE_EXTRA_OPTIONS+=" -DBUILD_DOC=OFF"
                     CMAKE_EXTRA_OPTIONS+=" -DUSE_SPHINX=OFF" # missing package to be installed.
@@ -220,7 +228,7 @@ if [[ -d "$SOURCE_DIR/otfftw-0.12" ]]; then
             esac
         elif [[ $k == "otsvm" ]]; then
             case $LINUX_DISTRIBUTION in
-                DB*|FD*)
+                DB*|FD*|UB*)
                     echo "WARNING: switching OFF documentation build"
                     CMAKE_EXTRA_OPTIONS+=" -DBUILD_DOC=OFF"
                     CMAKE_EXTRA_OPTIONS+=" -DUSE_SPHINX=OFF" # missing package to be installed.