From: vsr <vsr@opencascade.com>
Date: Tue, 16 Apr 2013 15:41:03 +0000 (+0000)
Subject: Minor changes
X-Git-Tag: V7_2_0rc1~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2100eb65b8406104b81a8ab20917d8a657e482f1;p=tools%2Finstall.git

Minor changes
---

diff --git a/config_files/DISTENE.sh b/config_files/DISTENE.sh
index 49f999a..87d6634 100755
--- a/config_files/DISTENE.sh
+++ b/config_files/DISTENE.sh
@@ -33,10 +33,9 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export DISTENE_HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export MESHGEMSHOME=\${DISTENE_HOME}/MeshGems-${MESHGEMS_VERSION}/Products
-export LD_LIBRARY_PATH=\${MESHGEMSHOME}/lib/Linux${PLT_SUFFIX}:\${LD_LIBRARY_PATH} 
-export PATH=\${MESHGEMSHOME}/bin/Linux${PLT_SUFFIX}:\${PATH} 
 export HEXOTICHOME=\${DISTENE_HOME}/Hexotic-${HEXOTIC_VERSION}
-export PATH=\${HEXOTICHOME}/bin/Linux${PLT_SUFFIX}:\${PATH} 
+export LD_LIBRARY_PATH=\${MESHGEMSHOME}/lib/Linux${PLT_SUFFIX}:\${LD_LIBRARY_PATH} 
+export PATH=\${MESHGEMSHOME}/bin/Linux${PLT_SUFFIX}:\${HEXOTICHOME}/bin/Linux${PLT_SUFFIX}:\${PATH} 
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
diff --git a/config_files/Sphinx.sh b/config_files/Sphinx.sh
index 3f91743..2c9e074 100755
--- a/config_files/Sphinx.sh
+++ b/config_files/Sphinx.sh
@@ -103,7 +103,7 @@ cd ${PRODUCT_SRC_DIR}/Sphinx-${SPHINX_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MA
 cd ${PRODUCT_DIR}/bin; 
 
 scripts=`find . -type f`
-for f in X $scripts ; do
+for f in X ${scripts} ; do
     if test "${f}" == "X" ; then continue ; fi
     sed -i "s%#\!.*python%#\!/usr/bin/env python%" ${f}
 done
diff --git a/config_files/docutils.sh b/config_files/docutils.sh
index 56c4b0f..6296f2f 100755
--- a/config_files/docutils.sh
+++ b/config_files/docutils.sh
@@ -75,7 +75,7 @@ cd ${PRODUCT_SRC_DIR} ; check_job ${PRODUCT_DIR}/BUILD.LOG python setup.py insta
 cd ${PRODUCT_DIR}/bin; 
 
 scripts=`find . -name "*.py" -exec basename {} ";" | awk -F. '{print $1}'`
-for f in X $scripts ; do
+for f in X ${scripts} ; do
     if test "${f}" == "X" ; then continue ; fi
     sed -i "s%#\!.*python%#\!/usr/bin/env python%" ${f}.py
     ln -sf ${f}.py ${f}
diff --git a/config_files/homard.sh b/config_files/homard.sh
index c564935..6a0a979 100755
--- a/config_files/homard.sh
+++ b/config_files/homard.sh
@@ -15,7 +15,7 @@
 #
 # homard version
 #
-HOMARD_VERSION=10.5
+HOMARD_VERSION=10.6
 
 #
 # homard's bin directory (platform)
diff --git a/config_files/libxml2.sh b/config_files/libxml2.sh
index 5381d14..b2bc15c 100755
--- a/config_files/libxml2.sh
+++ b/config_files/libxml2.sh
@@ -64,7 +64,7 @@ local patch_sources=1
 if [ "${patch_sources}" = "1" ] ; then
     if [ -f patches/${PRODUCT}.patch ] ; then
 	cp patches/${PRODUCT}.patch ${PRODUCT_SRC_DIR}
-	( cd ${PRODUCT_SRC_DIR}; patch < ${PRODUCT}.patch )
+	( cd ${PRODUCT_SRC_DIR}; patch  -p0< ${PRODUCT}.patch )
     fi
 fi