diff options
| author | eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-11-13 23:13:56 +0000 |
|---|---|---|
| committer | eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-11-13 23:13:56 +0000 |
| commit | 9ed5e17dff84c98cc503086313c2317898cd70f5 (patch) | |
| tree | e9d1570ff460261fc7dd9929c972d5e2dff38cdd /lib | |
| parent | b26cfc3988c40dfa104a4aa85662fcd6e8975722 (diff) | |
Do not add /lib64, /usr/lib64, or /usr/local/lib64 to LIBDIRS
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4770 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/make/extras/MPI/LAM | 11 | ||||
| -rw-r--r-- | lib/make/extras/MPI/MPICH | 6 | ||||
| -rw-r--r-- | lib/make/extras/MPI/OpenMPI | 9 |
3 files changed, 22 insertions, 4 deletions
diff --git a/lib/make/extras/MPI/LAM b/lib/make/extras/MPI/LAM index 3a5da1d6..3c0445d9 100644 --- a/lib/make/extras/MPI/LAM +++ b/lib/make/extras/MPI/LAM @@ -60,8 +60,15 @@ if test -z "$LAM_LIB_DIR" -o -z "$LAM_INC_DIR" ; then if test -z "$LAM_LIB_DIR" ; then : ${lam_libs="$LAM_DIR/lib"} - # don't add standard library search paths - if test "$lam_libs" != '/usr/lib' -a "$lam_libs" != '/usr/local/lib'; then + # don't add standard library search paths \ + if test \ + "$lam_libs" != '/lib' -a \ + "$lam_libs" != '/lib64' -a \ + "$lam_libs" != '/usr/lib' -a \ + "$lam_libs" != '/usr/lib64' -a \ + "$lam_libs" != '/usr/local/lib' -a \ + "$lam_libs" != '/usr/local/lib64'; \ + then LAM_LIB_DIR="$lam_libs" fi fi diff --git a/lib/make/extras/MPI/MPICH b/lib/make/extras/MPI/MPICH index 23641721..14bcaf5a 100644 --- a/lib/make/extras/MPI/MPICH +++ b/lib/make/extras/MPI/MPICH @@ -89,7 +89,11 @@ if test -d "$MPICH_DIR/build/$MPICH_ARCH" ; then MPICH_INC_DIRS="$MPICH_DIR/include $MPICH_DIR/build/$MPICH_ARCH/$MPICH_DEVICE/include" else # don't explicitely add standard include search paths - if test "$MPICH_DIR" != '/usr' -a "$MPICH_DIR" != '/usr/local'; then + if test \ + "$MPICH_DIR" != '/' -a \ + "$MPICH_DIR" != '/usr' -a \ + "$MPICH_DIR" != '/usr/local'; \ + then MPICH_LIB_DIR="$MPICH_DIR/lib" MPICH_INC_DIRS="$MPICH_DIR/include" fi diff --git a/lib/make/extras/MPI/OpenMPI b/lib/make/extras/MPI/OpenMPI index c4c1d9f5..b30b8479 100644 --- a/lib/make/extras/MPI/OpenMPI +++ b/lib/make/extras/MPI/OpenMPI @@ -57,7 +57,14 @@ if test -z "$OPENMPI_LIB_DIR" -o -z "$OPENMPI_INC_DIR" ; then fi # don't add standard library search paths - if test "$openmpi_libs" != '/usr/lib' -a "$openmpi_libs" != '/usr/lib64' -a "$openmpi_libs" != '/usr/local/lib'; then + if test \ + "$openmpi_libs" != '/lib' -a \ + "$openmpi_libs" != '/lib64' -a \ + "$openmpi_libs" != '/usr/lib' -a \ + "$openmpi_libs" != '/usr/lib64' -a \ + "$openmpi_libs" != '/usr/local/lib' -a \ + "$openmpi_libs" != '/usr/local/lib64'; \ + then OPENMPI_LIB_DIR="$openmpi_libs" fi fi |