X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Ftcltk-8.4.5.sh;h=14d0cefe973868f2bc16e315d146471ce1e07ec9;hb=3fc3493387b534f9e0c536de985ac0af3413ae7a;hp=94b74a6819877985d68f305c26977ce0147a68fa;hpb=8ca28c0c7587a1197570366c1242d6a920b3e137;p=tools%2Finstall.git

diff --git a/config_files/tcltk-8.4.5.sh b/config_files/tcltk-8.4.5.sh
index 94b74a6..14d0cef 100755
--- a/config_files/tcltk-8.4.5.sh
+++ b/config_files/tcltk-8.4.5.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 
+VERSION="8.4"
+
 check_version()
 {
-VERSION="8.4"
 if [ -z "$TCLHOME" ]; then
    echo "TCLHOME doesn't set"
    return 1
@@ -46,7 +47,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export TCLHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${TCLHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${TCLHOME}/lib:\${LD_LIBRARY_PATH}
-export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.4 \${TCLHOME}/lib/tk8.4 \${TCLLIBPATH}"
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION} \${TCLLIBPATH}"
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -70,7 +71,7 @@ if [ -n "${tclhome}" ] ; then
 export TCLHOME=${tclhome}
 export PATH=${path}
 export LD_LIBRARY_PATH=${ld_library_path}
-export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.4 \${TCLHOME}/lib/tk8.4 \${TCLLIBPATH}"
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION} \${TCLLIBPATH}"
 ##
 EOF
     (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -179,9 +180,10 @@ check_job ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG make install-exec
 (cd ${PRODUCT_DIR}/lib; ln -s libtkx8.3.so  libtkx.so)
 (cd ${PRODUCT_DIR}/lib; ln -s libtkx8.3.a   libtkx.a)
 
-du -sk ${INSTALL_WORK}/tcl8.4.5 > ${PRODUCT_DIR}/size.log
-du -sk ${INSTALL_WORK}/tk8.4.5 >> ${PRODUCT_DIR}/size.log
-du -sk ${INSTALL_WORK}/tclx8.3.5 >> ${PRODUCT_DIR}/size.log
+#du -sk ${INSTALL_WORK}/tcl8.4.5 > ${PRODUCT_DIR}/size.log
+#du -sk ${INSTALL_WORK}/tk8.4.5 >> ${PRODUCT_DIR}/size.log
+#du -sk ${INSTALL_WORK}/tclx8.3.5 >> ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR}
 rm -fr ${INSTALL_WORK}/tcl8.4.5 ${INSTALL_WORK}/tk8.4.5 ${INSTALL_WORK}/tclx8.3.5
 print_env
 }