X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fqt-3.3.3.sh;h=ea8993cc063bc5b85b1a7406cfe0dc08035f0dc5;hb=3fc3493387b534f9e0c536de985ac0af3413ae7a;hp=9ec2d4c8bcc6be589acc226e2fe3d9653ca644f1;hpb=6ddc46eed9a559d7e0dca34211a2de3dd8a74cb1;p=tools%2Finstall.git

diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh
index 9ec2d4c..ea8993c 100755
--- 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`
@@ -78,7 +87,7 @@ export LD_LIBRARY_PATH=${QTDIR}/lib:$LD_LIBRARY_PATH
 # basic flags
 QT_FLAGS="-release -thread -shared -qt-gif -platform linux-g++"
 # use system graphics libraries
-QT_FLAGS=$QT_FLAGS" -system-libpng -system-libjpeg -system-libmng -lpng -lmng -ljpeg"
+QT_FLAGS=$QT_FLAGS" -system-libjpeg -system-libpng -system-libmng -qt-imgfmt-jpeg -qt-imgfmt-png -qt-imgfmt-mng -lpng -lmng -ljpeg"
 # prefix
 
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure $QT_FLAGS -prefix ${PRODUCT_DIR}
@@ -90,8 +99,13 @@ GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
 EOF
+# small trick: INSTALL_ROOT is used inside qt-3.3.3 installation
+# so it should be set to empty string
+export INSTALL_ROOT_BACKUP=$INSTALL_ROOT
+export INSTALL_ROOT=""
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+export INSTALL_ROOT=$INSTALL_ROOT_BACKUP
 
 for b in `ls ${PRODUCT_WORK}/bin`; do
     if [ ! -e ${PRODUCT_DIR}/bin/$b ] || [ -h ${PRODUCT_DIR}/bin/$b ]; then
@@ -104,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
 }
 
@@ -119,7 +133,7 @@ cd ${PRODUCT_DIR}/lib
 sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libqt-mt.la > libqt-mt.la.new
 mv -f libqt-mt.la.new libqt-mt.la
 cd ${PRODUCT_DIR}/lib/pkgconfig
-sed -e "s%^prefix='\(.*\)'%prefix='${PRODUCT_DIR}/lib'%g" qt-mt.pc > qt-mt.pc.new
+sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" qt-mt.pc > qt-mt.pc.new
 mv -f qt-mt.pc.new qt-mt.pc
 
 print_env