]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Fix problems with native qt caused by latest integrations
authorvsr <vsr@opencascade.com>
Fri, 23 Dec 2005 08:56:31 +0000 (08:56 +0000)
committervsr <vsr@opencascade.com>
Fri, 23 Dec 2005 08:56:31 +0000 (08:56 +0000)
config_files/qt-3.3.3.sh

index 675e27017d12443fed1a80f471ae3b7f1a6b2f60..ea8993cc063bc5b85b1a7406cfe0dc08035f0dc5 100755 (executable)
@@ -26,9 +26,18 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-qtdir="`find_in_path libqt-mt.so.3.3.3 ${LD_LIBRARY_PATH}`"
+qtdir=""
+if [ -d /usr/share/qt3/lib ] ; then
+    qtdir="`find_in_path libqt-mt.so.3.3.3 /usr/share/qt3/lib`"
+fi
+if [ -z "${qtdir}" ] && [ -d /usr/lib/qt3/lib ] ; then
+    qtdir="`find_in_path libqt-mt.so.3.3.3 /usr/lib/qt3/lib`"
+fi
+if [ -z "${qtdir}" ] ; then
+    qtdir="`find_in_path libqt-mt.so.3.3.3 /usr/lib`"
+fi
 if [ -z "${qtdir}" ] ; then
-    qtdir="`find_in_path libqt-mt.so.3.3.3 /usr/lib/qt3`"
+    qtdir="`find_in_path libqt-mt.so.3.3.3 ${LD_LIBRARY_PATH}`"
 fi
 if [ -n "${qtdir}" ] ; then
     qtdir=`cd ${qtdir}/..; pwd`