X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config_files%2FPython-2.2.1.sh;h=753639b1f4b9ec193679701edd1907a43d0f719f;hb=057fa157d84d9c9c857071957f4068532fa28269;hp=2ddc754f8fb4cd2d3fa6c4279659cd12dbb97e6d;hpb=a567a46013f6124d41809b47b748299b91c09eb7;p=tools%2Finstall.git

diff --git a/config_files/Python-2.2.1.sh b/config_files/Python-2.2.1.sh
index 2ddc754..753639b 100755
--- a/config_files/Python-2.2.1.sh
+++ b/config_files/Python-2.2.1.sh
@@ -24,6 +24,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${PYTHONHOME}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${PYTHONHOME}/lib:\${LD_LIBRARY_PATH}
 export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
 export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
 export PYTHONPATH=\${PYTHONHOME}/lib/python\${PYTHON_VERSION}:\${PYTHONPATH}
@@ -56,10 +57,13 @@ if [ -n "${pythonhome}" ] ; then
 	path=`sort_path ${tmp}`
 	tmp="\${PYTHONHOME}/lib/python\${PYTHON_VERSION} ${pythonhome}/lib/python${maj_ver}.${min_ver} \${PYTHONPATH} ${PYTHONPATH}";  
 	pythonpath=`sort_path ${tmp}`
+	tmp="\${PYTHONHOME}/lib ${pythonhome}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+	ld_library_path=`sort_path ${tmp}`
 	cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONHOME=${pythonhome}
 export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
 export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
 export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
 export PYTHONPATH=${pythonpath}
@@ -97,11 +101,11 @@ cd ${PRODUCT_WORK}
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
     ./configure --prefix=${PRODUCT_DIR} --with-threads --with-cxx=`which g++`
 # vsr: not compiled on RedHat8.0 without libstdc++.so
-sed -e 's%LIBS=		-ldl  -lpthread -lutil%LIBS=		-ldl  -lpthread -lutil -lstdc++%g' Makefile > Makefile_new
-mv -f Makefile_new Makefile
+sed -e 's%LIBS=		-ldl  -lpthread -lutil%LIBS=		-ldl  -lpthread -lutil -lstdc++%g' Makefile > _Makefile
+mv -f _Makefile Makefile
 # vsr: socket module is not compiled on RedHat9 because of absent KERBEROS include/libs flags
-sed -e "s%\[('USE_SSL',1)\]%\[('USE_SSL',1),('OPENSSL_NO_KRB5',None)\]%g" setup.py > setup_new.py
-mv -f setup_new.py setup.py
+sed -e "s%\[('USE_SSL',1)\]%\[('USE_SSL',1),('OPENSSL_NO_KRB5',None)\]%g" setup.py > _setup.py
+mv -f _setup.py setup.py
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -110,7 +114,8 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 check_job ${PRODUCT_DIR}/MAKINSTALL.LOG make install
 
-rm -fr ${PRODUCT_WORK}
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 print_env
 }
 
@@ -134,4 +139,4 @@ export PRODUCT="Python-2.2.1"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
-${PROCEDURE}
\ No newline at end of file
+${PROCEDURE}