4 files changed, 14 insertions, 3 deletions
diff --git a/lib/make/extras/BLAS/setup.sh b/lib/make/extras/BLAS/setup.sh
index 93837aa9..ef81ceb6 100755
--- a/lib/make/extras/BLAS/setup.sh
+++ b/lib/make/extras/BLAS/setup.sh
@@ -29,6 +29,10 @@ if test "X$choose_blas" = 'Xyes' ; then
       exit 2
     fi
     echo "Found a BLAS package in $BLAS_DIR"
+    # don't explicitely add standard include and library search paths
+    if [ "$BLAS_DIR" = '/usr/lib' -o "$BLAS_DIR" = '/usr/local/lib' ]; then
+      BLAS_DIR=''
+    fi
   elif test "$BLAS_DIR" = 'none'; then
     # user doesn't want the library path added
     BLAS_DIR=''
diff --git a/lib/make/extras/FFTW/setup.sh b/lib/make/extras/FFTW/setup.sh
index 6d2e3dbe..cbc0e751 100755
--- a/lib/make/extras/FFTW/setup.sh
+++ b/lib/make/extras/FFTW/setup.sh
@@ -40,8 +40,12 @@ else
 fi
 
 # Set the FFTW libs, libdirs and includedirs
-FFTW_LIB_DIRS='$(FFTW_DIR)/lib'
-FFTW_INC_DIRS='$(FFTW_DIR)/include'
+
+# don't explicitely add standard include and library search paths
+if [ "$FFTW_DIR" != '/usr' -a "$FFTW_DIR" != '/usr/local' ]; then
+  FFTW_LIB_DIRS="$FFTW_DIR/lib"
+  FFTW_INC_DIRS="$FFTW_DIR/include"
+fi
 
 
 # Write the data out to the header and make files.
diff --git a/lib/make/extras/HDF5/setup.sh b/lib/make/extras/HDF5/setup.sh
index 173829a2..f34c1a31 100755
--- a/lib/make/extras/HDF5/setup.sh
+++ b/lib/make/extras/HDF5/setup.sh
@@ -182,7 +182,6 @@ CCTK_WriteLine make.extra.defn "HDF5_LIB_DIRS        = $HDF5_LIB_DIRS"
 CCTK_WriteLine make.extra.defn "HDF5_INC_DIRS        = $HDF5_INC_DIRS"
 
 CCTK_WriteLine make.extra.defn ''
-CCTK_WriteLine make.extra.defn ''
 
 CCTK_WriteLine make.extra.defn 'LIBS         += $(HDF5_LIBS)'
 CCTK_WriteLine make.extra.defn 'LIBDIRS      += $(HDF5_LIB_DIRS)'
diff --git a/lib/make/extras/LAPACK/setup.sh b/lib/make/extras/LAPACK/setup.sh
index 52fc6c1b..63af83f9 100755
--- a/lib/make/extras/LAPACK/setup.sh
+++ b/lib/make/extras/LAPACK/setup.sh
@@ -26,6 +26,10 @@ if test "X$choose_lapack" = "Xyes" ; then
       exit 2
     fi
     echo "  Found a LAPACK package in $LAPACK_DIR"
+    # don't explicitely add standard include and library search paths
+    if [ "$LAPACK_DIR" = '/usr/lib' -o "$LAPACK_DIR" = '/usr/local/lib' ]; then
+      LAPACK_DIR=''
+    fi
   elif test "$LAPACK_DIR" = 'none'; then
     # user doesn't want the library path added
     LAPACK_DIR=''