Detect and handle PETSc installed in more locations.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusExternal/PETSc/trunk@22 fc86f234-e40e-4302-a95b-5e02f8c343c9

1 files changed, 2 insertions, 2 deletions

diff --git a/PETSc.sh b/PETSc.sh
index 231654a..effa838 100755
--- a/PETSc.sh
+++ b/PETSc.sh
@@ -59,7 +59,7 @@ if [ -z "$PETSC_DIR" ]; then
   echo "BEGIN MESSAGE"
   echo 'PETSc selected but no PETSC_DIR set. Checking some places...'
   echo "END MESSAGE"
-  CCTK_Search PETSC_DIR '/usr /usr/local /usr/local/petsc /usr/local/packages/petsc /usr/local/apps/petsc' include/petsc.h
+  CCTK_Search PETSC_DIR '/ /usr /usr/local /usr/local/petsc /usr/local/packages/petsc /usr/local/apps/petsc' include/petsc.h
   if [ -z "$PETSC_DIR" ] ; then
      echo "BEGIN ERROR"
      echo 'Thorn PETSc requires an external installation of the PETSc ' \
@@ -106,7 +106,7 @@ fi
 
 # Set version-specific libraries
 # (version 2.2.0 and newer do not have libpetscsles.a any more)
-if [ -e "$PETSC_DIR/lib$PETSC_LIB_INFIX/$PETSC_ARCH/libpetscksp.a" ]; then
+if [ -e "$PETSC_DIR/lib$PETSC_LIB_INFIX/$PETSC_ARCH/libpetscksp.a" -o -e "$PETSC_DIR/lib/libpetscksp.a" ]; then
   PETSC_SLES_LIBS="petscksp"
 else
   PETSC_SLES_LIBS="petscsles"