--- mpitests-3.2/osu_benchmarks-3.1.1/makefile.make	2009-11-15 10:09:58.000000000 -0500
+++ mpitests-3.2/osu_benchmarks-3.1.1/makefile	2010-01-17 10:01:53.102371618 -0500
@@ -1,6 +1,5 @@
 SHELL		= /bin/sh
-prefix		= /usr/local
-CC		= ${MPIHOME}/bin/mpicc
+CC		= mpicc
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -22,9 +21,9 @@ osu_bcast: osu_bcast.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -lm -o osu_bcast osu_bcast.c $(LDLIBS)
 
 install:
-	test -d $(prefix)/osu_benchmarks || mkdir $(prefix)/osu_benchmarks
+	test -d $(DESTDIR)$(INSTALL_DIR) || mkdir -p $(DESTDIR)$(INSTALL_DIR)
 	for benchmark in $(ALL_BENCHMARKS); do\
-	    test -x $$benchmark && cp $$benchmark $(prefix)/osu_benchmarks;\
+	    test -x $$benchmark && cp $$benchmark $(DESTDIR)$(INSTALL_DIR)/mpitests-$$benchmark || /bin/true;\
 	done
 
 clean:
--- mpitests-3.2/IMB-3.2/src/Makefile.base.make	2009-11-15 10:09:58.000000000 -0500
+++ mpitests-3.2/IMB-3.2/src/Makefile.base	2010-01-17 10:06:29.888371547 -0500
@@ -59,12 +59,20 @@ 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
 
 .c.o:
-	$(CC) $(MPI_INCLUDE) $(CPPFLAGS) -D$(CPP) $(OPTFLAGS) -c $*.c
+	$(CC) $(CPPFLAGS) -D$(CPP) $(OPTFLAGS) -c $*.c
 
 # DEPENDENCIES
 IMB_declare.h:	IMB_settings.h IMB_comm_info.h IMB_settings_io.h IMB_bnames_mpi1.h \
--- mpitests-3.2/IMB-3.2/src/Makefile.make	2009-11-15 10:09:58.000000000 -0500
+++ mpitests-3.2/IMB-3.2/src/Makefile	2010-01-17 10:01:53.101371937 -0500
@@ -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.2/Makefile.make	2013-08-27 10:45:52.000000000 -0400
+++ mpitests-3.2/Makefile	2013-08-27 12:10:36.000000000 -0400
@@ -1,36 +1,24 @@
-CFLAGS = 
-MPIHOME=./
-CC = 
-LIBS =  
-INCLUDES =
-OBJS = 
-SRCS = 
-INSTALL_DIR=tests/
-INSTALL_IMB=IMB-3.2
-INSTALL_OSU=osu_benchmarks-3.1.1
-all: ibm osu
-install: install-ibm install-osu
+CC = mpicc
+IMB=IMB-3.2
+PRESTA=presta-1.4.0
+OSU=osu_benchmarks-3.1.1
+
+all: imb osu
+install: install-imb install-osu
+clean: clean-imb clean-osu
 
 # The variable $@ has the value of the target. 
-ibm: 
-	cd $(PWD)/$(INSTALL_IMB)/src && make MPIHOME=$(MPIHOME) IMB-MPI1
+imb: 
+	cd $(IMB)/src && make all
 osu: 
-	cd $(PWD)/$(INSTALL_OSU) && make MPIHOME=$(MPIHOME)
-clean-ibm: 
-	cd $(PWD)/$(INSTALL_IMB)/src && make MPIHOME=$(MPIHOME) clean
+	cd $(OSU) && make all
+osu-mpi1: 
+	cd $(OSU) && make mpi1
+clean-imb: 
+	cd $(IMB)/src && make clean
 clean-osu: 
-	cd $(PWD)/$(INSTALL_OSU) && make MPIHOME=$(MPIHOME) clean
-clean: clean-ibm clean-osu 
-	rm -rf $(MPIHOME)/$(INSTALL_DIR)
-install-ibm:
-	mkdir -p $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_IMB)
-	cp -f $(INSTALL_IMB)/src/IMB-MPI1 $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_IMB)
+	cd $(OSU) && make clean
+install-imb:
+	cd $(IMB)/src && 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)
-	cp -f $(INSTALL_OSU)/osu_alltoall  	$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
-	cp -f $(INSTALL_OSU)/osu_multi_lat	$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
+	cd $(OSU) && make install