New version of doxygen (1.4.6) is introduced

[tools/install.git] / config_files / qt-3.3.3.sh

diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh
index ec914d46f81aa29cc6739b8d66919227f52cb457..ea8993cc063bc5b85b1a7406cfe0dc08035f0dc5 100755 (executable)
--- a/config_files/qt-3.3.3.sh
+++ b/config_files/qt-3.3.3.sh
@@ -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`
@@ -109,7 +118,7 @@ done
 #rm -rf ${PRODUCT_DIR}/doc
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
-rm -fr ${PRODUCT_WORK}
+cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 print_env
 }