X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fsip-4.1.sh;h=05aa4da4629111749f23c9e4fdb68b40f6fdd289;hb=3fc3493387b534f9e0c536de985ac0af3413ae7a;hp=64c64ee29604f2452e2fd988a5d72300a076ad2b;hpb=15d500ad3ebc31eec8b286677cf4cee0e9899307;p=tools%2Finstall.git diff --git a/config_files/sip-4.1.sh b/config_files/sip-4.1.sh index 64c64ee..05aa4da 100755 --- 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 }