From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 30 Sep 2022 12:39:10 +0000 (+0200)
Subject: openturns: handle output directory for setup.py given command line options seem to... 
X-Git-Tag: V9_11_0~281
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=939cff74cc335509c676f43d351b9cd1ae433f45;p=tools%2Fsat_salome.git

openturns: handle output directory for setup.py given command line options seem to not be functional...
---

diff --git a/products/compil_scripts/openturns-1.19.sh b/products/compil_scripts/openturns-1.19.sh
index 3880af2..199c61d 100755
--- 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
@@ -140,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