From: vsr Date: Mon, 9 Dec 2013 08:40:01 +0000 (+0000) Subject: Fix of regression X-Git-Tag: V7_3_0rc1~18 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=84219b378f33529fc1ad90cf5323c9a29a69a539;p=tools%2Finstall.git Fix of regression --- diff --git a/config_files/qwt.sh b/config_files/qwt.sh index 6e99ec3..686dfe8 100755 --- a/config_files/qwt.sh +++ b/config_files/qwt.sh @@ -76,17 +76,17 @@ if [ "${patch_build_procedure}" = "1" ] ; then # specify install path if [ "${QWT_MAJOR_VERSION}" = "5" ] ; then # for Qwt 5.x the variable is INSTALLBASE - sed -i "s%\(INSTALLBASE[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" qwtconfig.pri + sed -i "s%\(INSTALLBASE[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" ${PRODUCT_SRC_DIR}/qwtconfig.pri else # for Qwt 6.x the variable is QWT_INSTALL_PREFIX - sed -i "s%\(QWT_INSTALL_PREFIX[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" qwtconfig.pri + sed -i "s%\(QWT_INSTALL_PREFIX[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" ${PRODUCT_SRC_DIR}/qwtconfig.pri fi if [ "${QWT_MAJOR_VERSION}" = "5" ] ; then # include QwtSvg support (required only for qwt 5.x) - sed -i "s%#\(CONFIG[[:space:]]*+=[[:space:]]*QwtSVGItem\)%\1%g" qwtconfig.pri + sed -i "s%#\(CONFIG[[:space:]]*+=[[:space:]]*QwtSVGItem\)%\1%g" ${PRODUCT_SRC_DIR}/qwtconfig.pri # specify correct installation path for the designer plugin (required only for qwt 5.x) - sed -i "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" designer/designer.pro + sed -i "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" ${PRODUCT_SRC_DIR}/designer/designer.pro fi fi