Add dependency of ParaView on freetype and libxml2

[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..aec4cbc4707fb9f008ce851e8fb440d6c51a7a0c 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-2014 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -20,7 +20,7 @@ return 0
 print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM 
+#${DELIM} ${PRODUCT_TYPE} ${DELIM} 
 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}
@@ -39,7 +39,7 @@ return $?
 install_binary()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 # create a product directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
@@ -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
+${PROCEDURE}