X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FDEBIANFORSALOME-3.1.sh;h=d5d2ecf2658c9cd10bef26d65b35da8fc3015e27;hb=260bf6b42efe9e30501c4e6e99b013da3fe34f77;hp=412142903335e3cf11a97497e442c3cdae689f4c;hpb=bcf5aa62532b80537748ddeff0936633cbdc0786;p=tools%2Finstall.git

diff --git a/config_files/DEBIANFORSALOME-3.1.sh b/config_files/DEBIANFORSALOME-3.1.sh
index 4121429..d5d2ecf 100755
--- a/config_files/DEBIANFORSALOME-3.1.sh
+++ b/config_files/DEBIANFORSALOME-3.1.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.
 #
@@ -21,24 +21,24 @@ print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM 
-export DEBIANFORSALOME=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export DEBIANFORSALOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PATH=\${DEBIANFORSALOME}/bin:\${DEBIANFORSALOME}/bin/X11:\${PATH}
 export LD_LIBRARY_PATH=\${DEBIANFORSALOME}/extralibs:\${DEBIANFORSALOME}/lib:\${DEBIANFORSALOME}/bin/X11:\${LD_LIBRARY_PATH}
 export CPLUS_INCLUDE_PATH=\${DEBIANFORSALOME}/include/c++/3.3:\${DEBIANFORSALOME}/include/c++/3.3/i486-linux:\${DEBIANFORSALOME}/include/c++/3.3/backward
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
 try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 return $?
 }
 
 install_binary()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
 # create a product directory
@@ -50,17 +50,19 @@ check_jb tar xfz ${SOURCE_DIR}/DEBIANLIBS-3.1.tar.gz -C ${PRODUCT_DIR}
 try_preinstalled
 }
 
+source ./common.sh
+
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
+export INST_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
 shift
 shift
 SINGLE_DIR=$9
+if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi
 export PRODUCT="DEBIANLIBS-3.1"
-export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-source ./common.sh
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 $PROCEDURE