Changing Python from 2.6.2 to 2.5.4

[tools/install.git] / config_files / tcltk-8.4.14.sh

diff --git a/config_files/tcltk-8.4.14.sh b/config_files/tcltk-8.4.14.sh
index ddd8a49b60e8d98e9448ada0082dd0b7b3f7bdb2..4d285badd0a3c7d260da2b49fe1bd1fe53246b4c 100755 (executable)
--- a/config_files/tcltk-8.4.14.sh
+++ b/config_files/tcltk-8.4.14.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
+#  Copyright : 2002-2008 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -59,7 +59,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export TCLHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PATH=\${TCLHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${TCLHOME}/lib:\${LD_LIBRARY_PATH}
-export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION} \${TCLLIBPATH}"
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION}"
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -203,9 +203,12 @@ check_job ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG make install-exec
 (cd ${PRODUCT_DIR}/lib; ln -fs libtkx8.3.so  libtkx.so)
 (cd ${PRODUCT_DIR}/lib; ln -fs libtkx8.3.a   libtkx.a)
 
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR}
 
+  if test `uname -m` = "x86_64" ; then
+         ln -s lib lib64
+      fi
+
 # remove sources and temporary files after building
 if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
     test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
@@ -233,6 +236,10 @@ mv -f _tclConfig.sh tclConfig.sh
 sed -e "s%${old_prefix}%${PRODUCT_DIR}%g" tkConfig.sh > _tkConfig.sh
 mv -f _tkConfig.sh tkConfig.sh
 
+  if test `uname -m` = "x86_64" ; then
+         cd ${PRODUCT_DIR} ; ln -s lib lib64
+      fi
+
 # to generate environment scripts
 try_preinstalled
 }