summaryrefslogtreecommitdiff
path: root/lib/make/extras
diff options
context:
space:
mode:
authortradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2004-09-23 11:51:40 +0000
committertradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2004-09-23 11:51:40 +0000
commit2490c263583e11528111f699038a9e549c37e648 (patch)
treeaf20a241f2cfe5b8584b7f2f855faf8dd35c96c4 /lib/make/extras
parent4d88ed8628ff7e774bb97f4b61d1c078f01ed651 (diff)
Don't set "/usr/include", "/usr/local/include", "/usr/lib", and "/usr/local/lib"
as explicit include/library search paths. git-svn-id: http://svn.cactuscode.org/flesh/trunk@3867 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/extras')
-rw-r--r--lib/make/extras/MPI/MPICH9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/make/extras/MPI/MPICH b/lib/make/extras/MPI/MPICH
index 85af6f6c..62aa45e1 100644
--- a/lib/make/extras/MPI/MPICH
+++ b/lib/make/extras/MPI/MPICH
@@ -6,7 +6,7 @@
# @desc
# Configuration options for MPI=MPICH
# @enddesc
-# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.18 2004-06-25 16:13:04 tradke Exp $
+# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.19 2004-09-23 11:51:40 tradke Exp $
# @@*/
@@ -72,8 +72,11 @@ if test -d "$MPICH_DIR/build/$MPICH_ARCH" ; then
MPICH_LIB_DIR="$MPICH_DIR/build/$MPICH_ARCH/$MPICH_DEVICE/lib"
MPICH_INC_DIRS="$MPICH_DIR/include $MPICH_DIR/build/$MPICH_ARCH/$MPICH_DEVICE/include"
else
- MPICH_LIB_DIR="$MPICH_DIR/lib"
- MPICH_INC_DIRS="$MPICH_DIR/include"
+ # don't explicitely add standard include search paths
+ if test "$MPICH_DIR" != '/usr' -a "$MPICH_DIR" != '/usr/local'; then
+ MPICH_LIB_DIR="$MPICH_DIR/lib"
+ MPICH_INC_DIRS="$MPICH_DIR/include"
+ fi
fi
# Select the device and any special options for it.