Salome HOME
Small corrections
authorinv <inv@opencascade.com>
Fri, 13 May 2011 14:54:05 +0000 (14:54 +0000)
committerinv <inv@opencascade.com>
Fri, 13 May 2011 14:54:05 +0000 (14:54 +0000)
config_files/HOMARD.sh
config_files/YACS.sh
config_files/common.sh

index 1719b65b94a783487ea352c225e4c0d31f90c1fa..73ded096f266812e65dd0cff73856a2d01e9d59f 100755 (executable)
@@ -114,7 +114,7 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ $INST_WITH_GUI == "FALSE" ] ; then
+if [ "$INST_WITH_GUI" = "FALSE" ] ; then
     check_jb tar xfz ${SOURCE_DIR}/HOMARDWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
 else
     check_jb tar xfz ${SOURCE_DIR}/HOMARDbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
index 1a588362eaa8cdec269ec8a2f486e080b0d9d47d..7b0bcdaaf8d3659f1fbbfd13497aaf992bed5e73 100755 (executable)
@@ -113,7 +113,7 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ $INST_WITH_GUI == "FALSE" ] ; then
+if [ "$INST_WITH_GUI" = "FALSE" ] ; then
     check_jb tar xfz ${SOURCE_DIR}/YACSWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
 else
     check_jb tar xfz ${SOURCE_DIR}/YACSbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
index a03aa7e2ab76cce31ae98a80f3dc7509b818aeaa..737d16f584c35903b264a32dee43abde6975966a 100755 (executable)
@@ -866,7 +866,14 @@ if [ "$l" != "X" ] ; then
        chmod -f --reference=$l $l"_"
        mv -f $l"_" $l          
 
-    # 22. process ParaView dependencies
+   # 21. process expat-2.0.1 dependencies
+       netgendir=`printenv NETGENHOME`/lib
+       sed -e "s%-L[^[:space:]]*Netgen[^[:space:]]*/lib%-L${netgendir}%g" $l > $l"_"
+       chmod -f --reference=$l $l"_"
+       mv -f $l"_" $l          
+
+
+    # 23. process ParaView dependencies
     paraviewdir=`printenv PVHOME`/lib
     if [ ! -d ${paraviewdir} ] ; then paraviewdir=`printenv PVHOME`/lib ; fi
     sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*ParaView-[0-9]\.[0-9]\+\.[0-9]/lib% \1${paraviewdir}%g" $l > $l"_"