fix a bug with 'test -n' option

[tools/install.git] / config_files / PyQt-3.3.2.sh

diff --git a/config_files/PyQt-3.3.2.sh b/config_files/PyQt-3.3.2.sh
index 266650088a05f1b808f9b8018dd9b6548d8f1124..7de10c99112caff906ac5d601004cfefa85a7774 100755 (executable)
--- a/config_files/PyQt-3.3.2.sh
+++ b/config_files/PyQt-3.3.2.sh
@@ -17,9 +17,9 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYQTDIR=\${INSTALL_ROOT}/${PRODUCT}
 export PYQT_SIPS=\${PYQTDIR}/sip
-export PYTHONPATH=\${PYQTDIR}:\${PYQTDIR}/qt:\${PYQTDIR}/qtgl:\${PYQTDIR}/qttable:\${PYQTDIR}/qtxml:\${PYTHONPATH}
 export PATH=\${PYQTDIR}:\$PATH 
 export LD_LIBRARY_PATH=\${PYQTDIR}:\$LD_LIBRARY_PATH 
+export PYTHONPATH=\${PYQTDIR}:\${PYQTDIR}/qt:\${PYQTDIR}/qtgl:\${PYQTDIR}/qttable:\${PYQTDIR}/qtxml:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -28,9 +28,9 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-pyqtdir="`find_in_path sip ${PATH}`"
+pyqtdir="`find_in_path pyuic ${PATH}`"
 if [ -z "${pyqtdir}" ] ; then
-    pyqtdir="`find_in_path sip /usr/bin`"
+    pyqtdir="`find_in_path pyuic /usr/bin`"
 fi
 if [ -n "${pyqtdir}" ] ; then
     pyqt_sips=${pyqtdir}/sip
@@ -40,9 +40,10 @@ if [ -n "${pyqtdir}" ] ; then
            return 1
        fi
     fi
+    python_version="`python -c 'import sys; print sys.version[:3]'`"
     pythonpath="`find_in_path libsip.so.9.1.0 ${PYTHONPATH}`"
     if [ -z "${pythonpath}" ] ; then
-       pythonpath="`find_in_path libsip.so.9.1.0 /usr/lib/python2.2/site-packages`"
+       pythonpath="`find_in_path libsip.so.9.1.0 /usr/lib/python${python_version}/site-packages`"
     fi
     if [ -n "${pythonpath}" ] ; then
        tmp="${pyqtdir} ${pyqtdir} \${PATH} ${PATH}";