]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Minor changes
authorvsr <vsr@opencascade.com>
Tue, 16 Apr 2013 15:41:03 +0000 (15:41 +0000)
committervsr <vsr@opencascade.com>
Tue, 16 Apr 2013 15:41:03 +0000 (15:41 +0000)
config_files/DISTENE.sh
config_files/Sphinx.sh
config_files/docutils.sh
config_files/homard.sh
config_files/libxml2.sh

index 49f999a93d86e750a79372095bd3e9e938476581..87d6634a1c1be4fac0b8090a881c36f9496c3602 100755 (executable)
@@ -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})
index 3f917430f208303d221d826fb2471b05658c59ad..2c9e0747eb158319871d491dccfa33a14c6ef602 100755 (executable)
@@ -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
index 56c4b0fcb27fffb51c8fa0844b28f81771dbad50..6296f2f0ea61140e4f9de3153fc74ab15533e6b9 100755 (executable)
@@ -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}
index c56493535f3ef5ce07b5b07b50227edc38520627..6a0a9797aa9e580f0b74c64968808a574690be79 100755 (executable)
@@ -15,7 +15,7 @@
 #
 # homard version
 #
-HOMARD_VERSION=10.5
+HOMARD_VERSION=10.6
 
 #
 # homard's bin directory (platform)
index 5381d142e65c795691714419ee2b6951dea6392f..b2bc15cc694c76e7e3e9e8b8b0a4ba7fea5bdce6 100755 (executable)
@@ -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