From: Nabil Ghodbane Date: Thu, 12 May 2022 07:48:22 +0000 (+0200) Subject: spns #29667 : switch between qmake-qt5 and qmake on Fedora X-Git-Tag: V9_9_0~41 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c1f6575cd924940a2164aa33cb5447f7a4f83c6d;p=tools%2Fsat_salome.git spns #29667 : switch between qmake-qt5 and qmake on Fedora --- diff --git a/products/compil_scripts/qwt-6.1.6.sh b/products/compil_scripts/qwt-6.1.6.sh index c53bf05..d35dc8c 100755 --- a/products/compil_scripts/qwt-6.1.6.sh +++ b/products/compil_scripts/qwt-6.1.6.sh @@ -16,9 +16,18 @@ mkdir -p ${PRODUCT_INSTALL} cd $SOURCE_DIR QMAKE_BIN=qmake -if [ "$DIST_NAME" == "FD" ] && [ "$DIST_VERSION" == "34" ] && [ "$SAT_qt_IS_NATIVE" == "1" ]; then - QMAKE_BIN=$(which qmake-qt5) +if [ "$SAT_qt_IS_NATIVE" == "1" ]; then + LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" + case $LINUX_DISTRIBUTION in + FD3*) + QMAKE_BIN=$(which qmake-qt5) + ;; + *) + echo "WARNING: using QMAKE_BIN = ${QMAKE_BIN}" + ;; + esac fi + echo echo "*** prepare $QMAKE_BIN" sed -i "s|\(QWT_INSTALL_PREFIX[[:space:]]*\)=\([[:space:]]*\)\(.*\)|\1=\2${PRODUCT_INSTALL}|g" qwtconfig.pri