--- mpitests-3.0/IMB-3.1/src/Makefile.make	2007-11-22 09:18:07.000000000 -0500
+++ mpitests-3.0/IMB-3.1/src/Makefile	2008-09-18 14:08:56.000000000 -0400
@@ -1,21 +1,9 @@
 # Enter root directory of mpich install
-MPI_HOME=$(MPIHOME)
-
-MPICC=$(shell find ${MPI_HOME} -name mpicc -print)
-
-NULL_STRING :=
-ifneq (,$(findstring /bin/mpicc,${MPICC}))
-MPI_INCLUDE := -I${MPI_HOME}/include
-else
-$(error Variable MPI_HOME="${MPI_HOME}" does not seem to contain a valid mpicc)
-endif
-LIB_PATH    =
-LIBS        = 
-CC          = ${MPI_HOME}/bin/mpicc 
+CC          = mpicc 
 OPTFLAGS    = -O3
 CLINKER     = ${CC}
 LDFLAGS     =
 CPPFLAGS    = 
 
-export MPI_INCLUDE CC LIB_PATH LIBS OPTFLAGS CLINKER LDFLAGS CPPFLAGS
+export CC OPTFLAGS CLINKER LDFLAGS CPPFLAGS
 include Makefile.base
--- mpitests-3.0/IMB-3.1/src/Makefile.base.make	2007-11-22 09:18:07.000000000 -0500
+++ mpitests-3.0/IMB-3.1/src/Makefile.base	2008-09-18 14:08:56.000000000 -0400
@@ -59,6 +59,14 @@ EXT : $(OBJEXT) 
 IO: $(OBJIO) 
 	$(CLINKER) $(LDFLAGS) -o IMB-IO $(OBJIO)  $(LIB_PATH) $(LIBS)
 
+install:
+	mkdir -p ${DESTDIR}; \
+	for benchmark in IMB-MPI1 IMB-EXT IMB-IO; do \
+	    if [ -e $$benchmark ]; then \
+	        cp $$benchmark ${DESTDIR}${INSTALL_DIR}/mpitests-$$benchmark; \
+	    fi; \
+	done
+
 # Make sure that we remove executables for specific architectures
 clean:
 	/bin/rm -f *.o *~ PI* core IMB-IO IMB-EXT IMB-MPI1 exe_io exe_ext exe_mpi1
--- mpitests-3.0/presta-1.4.0/Makefile.make	2006-08-01 04:25:21.000000000 -0400
+++ mpitests-3.0/presta-1.4.0/Makefile	2008-09-18 14:52:46.000000000 -0400
@@ -6,14 +6,7 @@
 #
 
 #  Default values
-MPIHOME=
-CC=$(MPIHOME)/bin/mpicc
 DISTRIB=
-STACK_PREFIX=
-LIBS= -lm -L$(MPIHOME)/lib/shared -L$(MPIHOME)/lib -L$(DISTRIB)/$(STACK_PREFIX)/lib64 -L$(DISTRIB)/$(STACK_PREFIX)/lib
-CFLAGS= -O2 -g -I$(MPIHOME)/include
-LDFLAGS= 
-INCDIR=
 
 #  Setting for using gcc for lint
 LINT=
@@ -45,7 +38,12 @@ glob: glob.o util.o 
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ glob.o util.o $(LIBS)
 
 globalop: globalop.o 
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ globalop.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -lm -o $@ globalop.o $(LIBS)
+
+install: $(EXES)
+	for i in $(EXES); do \
+		install -m 0755 $$i $(DESTDIR)$(INSTALL_DIR)/mpitests-$$i ; \
+	done
 
 clean:
 	rm -f $(EXES) *.o
--- mpitests-3.0/Makefile.make	2007-11-22 12:38:49.000000000 -0500
+++ mpitests-3.0/Makefile	2008-09-18 14:53:45.000000000 -0400
@@ -1,44 +1,32 @@
-CFLAGS = 
-MPIHOME=./
-CC = 
-LIBS =  
-INCLUDES =
-OBJS = 
-SRCS = 
-INSTALL_DIR=tests/
-INSTALL_IMB=IMB-3.1
-INSTALL_PRESTA=presta-1.4.0
-INSTALL_OSU=osu_benchmarks-3.0
+CC = mpicc
+IMB=IMB-3.1
+PRESTA=presta-1.4.0
+OSU=osu_benchmarks-3.0
+
 all: ibm osu presta
 install: install-ibm install-presta install-osu
+clean: clean-ibm clean-presta clean-osu 
 
 # The variable $@ has the value of the target. 
 ibm: 
-	cd $(PWD)/$(INSTALL_IMB)/src && make MPIHOME=$(MPIHOME) IMB-MPI1
+	cd $(IMB)/src && make all
 osu: 
-	cd $(PWD)/$(INSTALL_OSU) && make MPIHOME=$(MPIHOME)
+	cd $(OSU) && make all
+osu-mpi1:
+	cd $(OSU) && make mpi1
 presta:
-	cd $(PWD)/$(INSTALL_PRESTA) && make MPIHOME=$(MPIHOME)
+	cd $(PRESTA) && make all
+
 clean-ibm: 
-	cd $(PWD)/$(INSTALL_IMB)/src && make MPIHOME=$(MPIHOME) clean
+	cd $(IMB)/src && make clean
 clean-osu: 
-	cd $(PWD)/$(INSTALL_OSU) && make MPIHOME=$(MPIHOME) clean
+	cd $(OSU) && make clean
 clean-presta:
-	cd $(PWD)/$(INSTALL_PRESTA) && make MPIHOME=$(MPIHOME) clean
-clean: clean-ibm clean-presta clean-osu 
-	rm -rf $(MPIHOME)/$(INSTALL_DIR)
+	cd $(PRESTA) && make clean
+
 install-ibm:
-	mkdir -p $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_IMB)
-	cp -f $(INSTALL_IMB)/src/IMB-MPI1 $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_IMB)
+	cd $(IMB)/src && make install
 install-presta:
-	mkdir -p $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_PRESTA)
-	cp -f $(INSTALL_PRESTA)/com    		$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_PRESTA)
-	cp -f $(INSTALL_PRESTA)/glob     	$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_PRESTA)
-	cp -f $(INSTALL_PRESTA)/globalop 	$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_PRESTA)
+	cd $(PRESTA) && make install
 install-osu:
-	mkdir -p $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
-	cp -f $(INSTALL_OSU)/osu_bw		    $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
-	cp -f $(INSTALL_OSU)/osu_bibw		$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
-	cp -f $(INSTALL_OSU)/osu_bcast		$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
-	cp -f $(INSTALL_OSU)/osu_latency	$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
-	cp -f $(INSTALL_OSU)/osu_mbw_mr  	$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
+	cd $(OSU) && make install
--- mpitests-3.0/osu_benchmarks-3.0/Makefile.make	2007-11-22 09:18:07.000000000 -0500
+++ mpitests-3.0/osu_benchmarks-3.0/Makefile	2008-09-18 14:08:56.000000000 -0400
@@ -1,6 +1,6 @@
-CC		= ${MPIHOME}/bin/mpicc
+CC		= mpicc
 MPI1_BENCHMARKS	= osu_bcast osu_bibw osu_bw osu_latency osu_mbw_mr
-MPI2_BENCHMARKS	= osu_acc_latency osu_get_bw osu_get_latency osu_latency_mt\
+MPI2_BENCHMARKS	= osu_get_bw osu_get_latency osu_latency_mt\
 		  osu_put_bibw osu_put_bw osu_put_latency
 ALL_BENCHMARKS	= ${MPI1_BENCHMARKS} ${MPI2_BENCHMARKS}
 
@@ -12,10 +12,10 @@ mpi2:	${ALL_BENCHMARKS}
 all:	${ALL_BENCHMARKS}
 
 install:
-	mkdir -p ${PREFIX}/osu_benchmarks &&\
+	mkdir -p ${DESTDIR}${INSTALL_DIR} &&\
 	  for benchmark in ${ALL_BENCHMARKS}; do\
 	  if [ -e $$benchmark ]; then\
-	  cp $$benchmark ${PREFIX}/osu_benchmarks/;\
+	  cp $$benchmark ${DESTDIR}${INSTALL_DIR}/mpitests-$$benchmark;\
 	  fi; done
 
 clean: