X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FcheckFortran.sh;h=82b78345ae427a253aedeb9f16bd72e39a658b5e;hb=260bf6b42efe9e30501c4e6e99b013da3fe34f77;hp=ebdd67a86c9639541f2bf14f9576fb4377485d96;hpb=d57174c1e36bc06a199b0d4557c0577fd3e52a53;p=tools%2Finstall.git diff --git a/config_files/checkFortran.sh b/config_files/checkFortran.sh index ebdd67a..82b7834 100755 --- a/config_files/checkFortran.sh +++ b/config_files/checkFortran.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2007 CEA +# Copyright : 2002-2008 CEA # # This script is the part of the SALOME installation procedure. # @@ -51,13 +51,13 @@ for prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fo done if test -n "$FORT"; then - cat >conftest.f <<_ACEOF + cat >${DIR}/ftest.f <<_ACEOF program main end _ACEOF - $FORT conftest.f > /dev/null - rm -f conftest.* + $FORT -o ${DIR}/ftest.out ${DIR}/ftest.f > /dev/null + rm -f ${DIR}/ftest.* exit $? else # Fortran compiler was not found @@ -66,8 +66,8 @@ fi } find_libraries(){ - source ${INST_DIR}/env_products.sh - ldd ${INST_DIR}/*/lib/salome/*.so | grep not + source ${DIR}/env_products.sh + ldd ${DIR}/*/lib/salome/*.so | grep not if test $? -eq 0; then exit 1 else @@ -76,7 +76,7 @@ find_libraries(){ } PROCEDURE=$1 -test $# -eq 2 && INST_DIR=$2 +DIR=$2 $PROCEDURE