spns #4320: fix installation issue about DB10 and UB22

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 2f77cb326de63dd9abce3250a5e8a3d2f42bad19..ee44f3051011dd6309485d01d0287d57b9b43c86 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -297,7 +297,7 @@ __overwrite__ :
         #   - Qt minimal version 5.12
         #   - xmlpatterns executable
         __condition__ : "VARS.dist in ['DB10']"
-        'APPLICATION.rm_products'       : ['nose_py3','assimulo']
+        'APPLICATION.rm_products'       : ['nose_py3','assimulo', 'irmb', 'mcut']
         'APPLICATION.products.nlopt'    : '2.4.2'
         'APPLICATION.products.opencv'   : '3.2.0'
         'APPLICATION.products.cminpack' : 'native'

diff --git a/products/compil_scripts/pyqwt-0.12.1.sh b/products/compil_scripts/pyqwt-0.12.1.sh
index 180605da22a9a7bda92becd1fee350ebefacbb1e..b8bb44e9043caffb1afb74e766b8846120b51c5f 100755 (executable)
--- a/products/compil_scripts/pyqwt-0.12.1.sh
+++ b/products/compil_scripts/pyqwt-0.12.1.sh
@@ -16,11 +16,21 @@ cd $BUILD_DIR
 export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
 export PATH=${PRODUCT_INSTALL}/bin:$PATH
 
-${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
+case $LINUX_DISTRIBUTION in
+    DB10|UB22*)
+        mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
+        cp -r $SOURCE_DIR/qwt $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages/qwt
+        ;;
+    *)
+        ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
+        ;;
+esac
+
 if [ $? -ne 0 ]; then
     echo "ERROR: could not install"
     exit 1
 fi
+
 if [ -d ${PRODUCT_INSTALL}/lib64 ]; then
     mv ${PRODUCT_INSTALL}/lib64 ${PRODUCT_INSTALL}/lib
 fi