diff -urN scalapack-1.8.0-2/SLmake.inc scalapack-1.8.0/SLmake.inc
--- scalapack-1.8.0-2/SLmake.inc	2008-08-14 11:28:24.000000000 -0400
+++ scalapack-1.8.0/SLmake.inc	2008-08-14 12:34:26.000000000 -0400
@@ -33,15 +33,30 @@
 #
 #  MPI setup; tailor to your system if using MPIBLACS
 #
+ifeq ($(MPI),openmpi)
+USEMPI        = -DUsingMpiBlacs
+ifeq ($(BUILD),static)
+SMPLIB        = -L/usr/lib/openmpi/lib/ -lmpi -lmpi_f77
+BLACSFINIT    = /usr/lib/libblacsF77init-openmpi.a
+BLACSCINIT    = /usr/lib/libblacsCinit-openmpi.a
+BLACSLIB      = /usr/lib/libblacs-openmpi.a
+else
+SMPLIB        = -L/usr/lib/openmpi/lib/ -lmpi -lmpi_f77
+BLACSFINIT    = -lblacsF77init-openmpi
+BLACSCINIT    = -lblacsCinit-openmpi
+BLACSLIB      = -lblacs-openmpi
+endif
+TESTINGdir    = $(home)/TESTING
+endif
 ifeq ($(MPI),lam)
 USEMPI        = -DUsingMpiBlacs
 ifeq ($(BUILD),static)
-SMPLIB        = -lmpi
+SMPLIB        = -L/usr/lib/lam/lib -lmpi
 BLACSFINIT    = /usr/lib/libblacsF77init-lam.a
 BLACSCINIT    = /usr/lib/libblacsCinit-lam.a
 BLACSLIB      = /usr/lib/libblacs-lam.a
 else
-SMPLIB        = -lmpi
+SMPLIB        = -L/usr/lib/lam/lib -lmpi
 BLACSFINIT    = -lblacsF77init-lam
 BLACSCINIT    = -lblacsCinit-lam
 BLACSLIB      = -lblacs-lam
@@ -56,7 +71,7 @@
 BLACSCINIT    = /usr/lib/libblacsCinit-mpich.a
 BLACSLIB      = /usr/lib/libblacs-mpich.a
 else
-SMPLIB        = /usr/lib/mpich/lib/libmpich.a
+SMPLIB        = -L/usr/lib/mpich/lib/shared -lmpich
 BLACSFINIT    = -lblacsF77init-mpich
 BLACSCINIT    = -lblacsCinit-mpich
 BLACSLIB      = -lblacs-mpich
