From: vsr <vsr@opencascade.com>
Date: Wed, 21 Dec 2005 07:43:46 +0000 (+0000)
Subject: Fix a bug with environment for qwt libraries
X-Git-Tag: V_3_1_0_Debian~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8c9beb9ef2c67dab7ba6df468a85ef38d4f2780e;p=tools%2Finstall.git

Fix a bug with environment for qwt libraries
---

diff --git a/config_files/qwt-4.2.0.sh b/config_files/qwt-4.2.0.sh
index d91c2f0..88f5b2d 100755
--- a/config_files/qwt-4.2.0.sh
+++ b/config_files/qwt-4.2.0.sh
@@ -26,13 +26,14 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
 qwthome="`find_in_path libqwt.so.4.2.0 ${LD_LIBRARY_PATH}`"
+if [ -z "${qwthome}" ] ; then
+    qwthome="`find_in_path libqwt.so.4.2.0 /usr/lib`"
+fi
 if [ -n "${qwthome}" ] ; then
-    qwthome=`cd ${qwthome}/..; pwd`
-    tmp="\${QWTHOME}/lib ${QWTHOME}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+    tmp="${qwthome} ${qwthome} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
     ld_library_path=`sort_path ${tmp}`
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export QWTHOME=${qwthome}
 export LD_LIBRARY_PATH=${ld_library_path}
 ##
 EOF