rely on non empty %SALOME_APPLICATION_NAME% to target URANIE

[tools/sat_salome.git] / products / compil_scripts / netgen_5_3_1.sh

diff --git a/products/compil_scripts/netgen_5_3_1.sh b/products/compil_scripts/netgen_5_3_1.sh
index 793338bbed7c527dcee135cb3691ed712d5359fa..45c30b06a035b07dec34f622e919453c4c6391d8 100755 (executable)
--- a/products/compil_scripts/netgen_5_3_1.sh
+++ b/products/compil_scripts/netgen_5_3_1.sh
@@ -61,27 +61,21 @@ echo "*** configure"
 BFLAG="-m64"
 OLEVEL="-O2"
 
-if [ "${TCLHOME}" == '/usr' ]
+if [ "${TCLHOME}" != '/usr' ]
 then
-    TCL_LIB_DIR=${TCLHOME}/lib64
-else
-    TCL_LIB_DIR=${TCLHOME}/lib
+    TCL_TK_OPTIONS="--with-tcl=${TCLHOME}/lib --with-tk=${TCLHOME}/lib --with-tclinclude=${TCLHOME}/include"
 fi
 echo ./configure --prefix=${PRODUCT_INSTALL} \
     --with-occ=${CASROOT} \
-    --with-tcl=${TCL_LIB_DIR} \
-    --with-tk=${TCL_LIB_DIR} \
     --disable-openmp \
-    --with-tclinclude=${TCLHOME}/include \
+    ${TCL_TK_OPTIONS} \
     CXXFLAGS="-I${CASROOT}/include/opencascade ${OLEVEL} ${BFLAG} -std=c++0x"
 ./configure --prefix=${PRODUCT_INSTALL} \
     --with-occ=${CASROOT} \
-    --with-tcl=${TCL_LIB_DIR} \
-    --with-tk=${TCL_LIB_DIR} \
     --disable-openmp \
-    --with-tclinclude=${TCLHOME}/include \
+    ${TCL_TK_OPTIONS} \
     CXXFLAGS="-I${CASROOT}/include/opencascade ${OLEVEL} ${BFLAG} -std=c++0x" #-std=gnu++11" #-std=c++11 -std=c++0x"
-    
+
 if [ $? -ne 0 ]
 then
     echo "error on configure"
@@ -89,8 +83,8 @@ then
 fi
 
 echo
-echo "*** compile"
-make -j4
+echo "*** make ${MAKE_OPTIONS}"
+make  ${MAKE_OPTIONS}
 if [ $? -ne 0 ]
 then
     echo "error on make"