Version number : 2.2.8

[tools/install.git] / config_files / Python-2.2.1.sh

diff --git a/config_files/Python-2.2.1.sh b/config_files/Python-2.2.1.sh
index 2dea9f89dab58d6cfbc927ed4f1576ae1349fa84..753639b1f4b9ec193679701edd1907a43d0f719f 100755 (executable)
--- a/config_files/Python-2.2.1.sh
+++ b/config_files/Python-2.2.1.sh
@@ -24,10 +24,10 @@ 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}
-export LD_LIBRARY_PATH=\${PYTHONHOME}/lib:\${LD_LIBRARY_PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -63,10 +63,10 @@ if [ -n "${pythonhome}" ] ; then
 #$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}
-export LD_LIBRARY_PATH=${ld_library_path}
 ##
 EOF
        make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -99,7 +99,7 @@ check_jb tar xfz ${SOURCE_DIR}/Python-2.2.1.tgz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
 
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
-    ./configure --prefix=${PRODUCT_DIR} --with-threads --with-cxx=`which g++` --enable-shared
+    ./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
 mv -f _Makefile Makefile