SALOME 6.5.0 preparation: homard 10.3 -> 10.4

[tools/install.git] / config_files / DEBIANFORSALOME-3.1.sh

diff --git a/config_files/DEBIANFORSALOME-3.1.sh b/config_files/DEBIANFORSALOME-3.1.sh
index 36b32bf2ba37bf54c6bac6a6be40bfc6e5a8c4af..d5d2ecf2658c9cd10bef26d65b35da8fc3015e27 100755 (executable)
--- 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.
 #
@@ -50,6 +50,8 @@ 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;
@@ -60,7 +62,7 @@ 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=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-source ./common.sh
 $PROCEDURE