New version of doxygen (1.4.6) is introduced

[tools/install.git] / config_files / sip-4.1.sh

diff --git a/config_files/sip-4.1.sh b/config_files/sip-4.1.sh
index 64c64ee29604f2452e2fd988a5d72300a076ad2b..05aa4da4629111749f23c9e4fdb68b40f6fdd289 100755 (executable)
--- a/config_files/sip-4.1.sh
+++ b/config_files/sip-4.1.sh
@@ -37,10 +37,10 @@ if [ -n "${sipdir}" ] ; then
     if [ -z "${sippython}" ] ; then
         sippython="`find_in_path sip.so /usr/lib/python${python_version}/site-packages`"
     fi
-    if [ -n ${sippython} ]; then
+    if [ -n "${sippython}" ]; then
         tmp="${sipdir} ${sipdir} \${PATH} ${PATH}";
         path=`sort_path ${tmp}`
-        tmp="${sipdir} ${sipdir} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";
+        tmp="${sippython} ${sippython} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";
         ld_library_path=`sort_path ${tmp}`
         tmp="${sippython} ${sippython} \${PYTHONPATH} ${PYTHONPATH}";
         pythonpath=`sort_path ${tmp}`
@@ -83,7 +83,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
-rm -fr ${PRODUCT_WORK}
+cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 print_env
 }