--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2005-04-18 16:22:41.000000000 -0500
+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-04-18 16:34:42.000000000 -0500
@@ -29,16 +29,16 @@
 #  and the directory where the BLACS libraries are
 #
 BLACSDBGLVL   = 0
-BLACSdir      = /usr/local/lib
+BLACSdir      = /usr/lib
 #
 #  MPI setup; tailor to your system if using MPIBLACS
 #  Will need to comment out these 6 lines if using PVM
 #
 USEMPI        = -DUsingMpiBlacs
-SMPLIB        = /usr/local/mpich-1.2.1/lib/libmpich.a
-BLACSFINIT    = $(BLACSdir)/libmpiblacsF77init-p4.a
-BLACSCINIT    = $(BLACSdir)/libmpiblacsCinit-p4.a
-BLACSLIB      = $(BLACSdir)/libmpiblacs-p4.a
+SMPLIB        = /usr/lib/libmpi.a
+BLACSFINIT    = $(BLACSdir)/libmpiblacsF77init.a
+BLACSCINIT    = $(BLACSdir)/libmpiblacsCinit.a
+BLACSLIB      = $(BLACSdir)/libmpiblacs.a
 TESTINGdir    = $(home)/TESTING
 
 #
@@ -67,12 +67,12 @@
 #
 #  The fortran and C compilers, loaders, and their flags
 #
-F77           = g77
+F77           = gfortran
 #F77           = /usr/local/pgi/linux86/bin/pgf77
 CC            = gcc
 NOOPT         = 
-F77FLAGS      =  -O3 $(NOOPT)
-CCFLAGS       = -O4
+F77FLAGS      = $(RPM_OPT_FLAGS) $(NOOPT)
+CCFLAGS       = $(RPM_OPT_FLAGS)
 SRCFLAG       =
 F77LOADER     = $(F77)
 CCLOADER      = $(CC)
@@ -94,7 +94,7 @@
 #  The name of the libraries to be created/linked to
 #
 SCALAPACKLIB  = $(home)/libscalapack.a
-BLASLIB       = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a
+BLASLIB       = /usr/lib/libblas.a
 #
 PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
 PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2005-04-18 16:59:45.000000000 -0500
+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-04-18 16:59:59.000000000 -0500
@@ -19,7 +19,7 @@
 #  The complete path to the top level of ScaLAPACK directory, usually
 #  $(HOME)/SCALAPACK
 #
-home          = $(HOME)/SCALAPACK
+home          = $(RPM_BUILD_DIR)/scalapack-1.7/SCALAPACK
 #
 #  The platform identifier to suffix to the end of library names
 #
--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2005-04-18 17:17:04.000000000 -0500
+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-04-18 17:20:06.000000000 -0500
@@ -96,7 +96,10 @@
 SCALAPACKLIB  = $(home)/libscalapack.a
 BLASLIB       = /usr/lib/libblas.a
 #
-PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
-PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
-RLIBS         = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB)
+LAMLIBS       = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a
+EXTRALIBS     = -ldl -lpthread -llam -lmpi -llamf77mpi
+
+PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
+PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
+RLIBS         = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
 LIBS          = $(PBLIBS)