From c863fdb7db48394b9aa4d8d44b650924e6e44ae8 Mon Sep 17 00:00:00 2001 From: Martin Beck Date: Wed, 6 Jul 2016 13:32:44 +0200 Subject: [PATCH] [fix/installexternal] Corrected directory for mpi-config, got rid of search for dune-common-2.0 --- bin/installexternal.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/bin/installexternal.sh b/bin/installexternal.sh index 8a10083ad2..3b00b323c1 100755 --- a/bin/installexternal.sh +++ b/bin/installexternal.sh @@ -412,17 +412,12 @@ for TMP in "$@"; do MPICXX=$(which mpicxx) MPIF77=$(which mpif77) - if test -f $(pwd)'/../dune-common/bin/mpi-config'; then - MPICONFIG=$(pwd)'/../dune-common/bin/mpi-config' + if test -f $TOPDIR'/dune-common/bin/mpi-config'; then + MPICONFIG=$TOPDIR'/dune-common/bin/mpi-config' else - if test -f $(pwd)'/../dune-common-2.0/bin/mpi-config' - then - MPICONFIG=$(pwd)'/../dune-common-2.0/bin/mpi-config' - else - echo "MPICONFIG not found!" - return - fi - fi + echo "MPICONFIG not found!" + return + fi MPILIBS=$($MPICONFIG --libs) MPILIBDIR=$(echo $MPILIBS | sed "s/.*-L\([^[:blank:]]*\).*/\1/") -- GitLab