From: maintenance team <salome-mnt@opencascade.com>
Date: Wed, 21 Oct 2009 07:42:04 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V5_1_3~25
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a46bf3eeccaa266fcb9d56432de5e7a083ac1bb2;p=tools%2Finstall.git

*** empty log message ***
---

diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index eb94512..bc2cab0 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -224,7 +224,7 @@
 	     description="Partitioning/decimation module for the SALOME platform">
       <installation os="Debian 4.0 64bit"
                     version="5.1.3" 
-		    disable="true"
+		    disable="false"
 		    installdiskspace="208,221,2958"
 		    script="MULTIPR.sh"/>
     </product>
@@ -450,7 +450,7 @@
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
-             description="libBatch is ">
+             description="Generic batch management library">
       <installation os="Debian 4.0 64bit"
                     version="1.0.0" 
 		    disable="false"
@@ -548,7 +548,6 @@
 		    script="libxml2-2.7.3.sh"/>
     </product>
   </products>
-
   <dependencies>
     <product name="KERNEL">
       <dep>boost</dep>
@@ -561,6 +560,7 @@
       <dep>Graphviz</dep>
       <dep>docutils</dep>
       <dep>libxml2</dep>
+      <dep>libBatch</dep>
     </product>
     <product name="GUI">
       <dep>boost</dep>
diff --git a/config_files/MULTIPR.sh b/config_files/MULTIPR.sh
index 0e9e116..eeec798 100755
--- a/config_files/MULTIPR.sh
+++ b/config_files/MULTIPR.sh
@@ -14,8 +14,9 @@
 
 check_version(){
 if [ -n "${MULTIPR_ROOT_DIR}" ]; then
-    if [ -f ${MULTIPR_ROOT_DIR}/bin/salome/VERSION ]; then
-	ver=`cat ${MULTIPR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
+    check_lib_version VERSION ${MULTIPR_ROOT_DIR}/bin/salome
+    if [ "$?" -eq "0" ]; then
+	ver=`cat ${MULTIPR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
 	if [ "$ver" = "${SALOME_VERSION}" ]; then
 	    return 0
 	fi
@@ -66,7 +67,7 @@ install_source()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
-
+# unpack
 check_jb tar xfz ${SOURCE_DIR}/MULTIPRsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts