diff -Nur mpich2-1.0.7/Makefile.in mpich2-1.0.7.new/Makefile.in
--- mpich2-1.0.7/Makefile.in	2008-04-04 15:03:17.000000000 -0700
+++ mpich2-1.0.7.new/Makefile.in	2008-06-22 11:14:25.000000000 -0700
@@ -185,6 +185,7 @@
 	if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi
 	if [ ! -d ${DESTDIR}${libdir} ] ; then $(MKDIR_P) ${DESTDIR}${libdir} ; fi
 	${MAKE} install-local
+	${MAKE} install-examples
 	$(INSTALL_DATA) src/include/mpi.h ${DESTDIR}${includedir}/mpi.h
 	$(INSTALL_DATA) lib/lib${MPILIBNAME}.a ${DESTDIR}${libdir}/lib${MPILIBNAME}.a
 	if [ ! -d ${DESTDIR}${docdir} ] ; then $(MKDIR_P) ${DESTDIR}${docdir} ; fi
@@ -479,9 +480,9 @@
 # documentation)
 install-examples:
 	if [ ! -d ${DESTDIR}${exec_prefix}/examples ] ; then \
-	    $(MKDIR_P) ${DESTDIR}${exec_prefix}/examples ; \
+	    $(MKDIR_P) ${DESTDIR}${exec_prefix}/share/mpich2/examples ; \
 	fi
-	$(INSTALL_PROGRAM) examples/cpi ${DESTDIR}${exec_prefix}/examples/cpi
+	$(INSTALL_PROGRAM) examples/cpi ${DESTDIR}${exec_prefix}/share/mpich2/examples/cpi
 
 install-devdocs:
 	(cd doc && $(MAKE) install-devdocs)
diff -Nur mpich2-1.0.7/src/mpe2/Makefile.in mpich2-1.0.7.new/src/mpe2/Makefile.in
--- mpich2-1.0.7/src/mpe2/Makefile.in	2008-03-12 17:43:05.000000000 -0700
+++ mpich2-1.0.7.new/src/mpe2/Makefile.in	2008-06-22 11:14:44.000000000 -0700
@@ -70,25 +70,25 @@
 
 ########  Installing
 install: FORCE_TARGET
-	@if [ -n "$(PREFIX)" ] ; then \
-	     ./sbin/mpeinstall -prefix=$(PREFIX) -dmode="" ; \
+	@if [ -n "$(prefix)" ] ; then \
+	     ./sbin/mpeinstall -prefix=$(prefix) -dmode="" ; \
 	 else \
 	     ./sbin/mpeinstall -dmode="" ; \
 	 fi
 
 installcheck:
-	@if [ -n "$(PREFIX)" ] ; then \
-	     ./sbin/mpecheckinstall -prefix=$(PREFIX) ; \
+	@if [ -n "$(prefix)" ] ; then \
+	     ./sbin/mpecheckinstall -prefix=$(prefix) ; \
 	 else \
 	     ./sbin/mpecheckinstall ; \
 	 fi
 
 installcheck-all:
-	@if [ -n "$(PREFIX)" ] ; then \
+	@if [ -n "$(prefix)" ] ; then \
 	     if [ -n "$(MPERUN)" ] ; then \
-	         ./sbin/mpecheckinstall -prefix=$(PREFIX) -run="$(MPERUN)" ; \
+	         ./sbin/mpecheckinstall -prefix=$(prefix) -run="$(MPERUN)" ; \
 	     else \
-	         ./sbin/mpecheckinstall -prefix=$(PREFIX) -run ; \
+	         ./sbin/mpecheckinstall -prefix=$(prefix) -run ; \
 	     fi ; \
 	 else \
 	     if [ -n "$(MPERUN)" ] ; then \
diff -Nur mpich2-1.0.7/src/mpe2/src/slog2sdk/Makefile.in mpich2-1.0.7.new/src/mpe2/src/slog2sdk/Makefile.in
--- mpich2-1.0.7/src/mpe2/src/slog2sdk/Makefile.in	2008-03-12 17:43:05.000000000 -0700
+++ mpich2-1.0.7.new/src/mpe2/src/slog2sdk/Makefile.in	2008-06-22 11:14:43.000000000 -0700
@@ -15,8 +15,8 @@
 	  done
 
 install:
-	@if [ -n "$(PREFIX)" ] ; then \
-	     ./sbin/install-package -prefix=$(PREFIX) ; \
+	@if [ -n "$(prefix)" ] ; then \
+	     ./sbin/install-package -prefix=$(prefix) ; \
 	 else \
 	     ./sbin/install-package ; \
 	 fi
diff -Nur mpich2-1.0.7/src/mpe2/src/slog2sdk/trace_rlog/Makefile.in mpich2-1.0.7.new/src/mpe2/src/slog2sdk/trace_rlog/Makefile.in
--- mpich2-1.0.7/src/mpe2/src/slog2sdk/trace_rlog/Makefile.in	2008-03-12 17:43:05.000000000 -0700
+++ mpich2-1.0.7.new/src/mpe2/src/slog2sdk/trace_rlog/Makefile.in	2008-06-22 11:14:42.000000000 -0700
@@ -7,8 +7,8 @@
 	cd src && $(MAKE)
 
 install:
-	@if [ -n "$(PREFIX)" ] ; then \
-	     ./sbin/install-package -prefix=$(PREFIX) ; \
+	@if [ -n "$(prefix)" ] ; then \
+	     ./sbin/install-package -prefix=$(prefix) ; \
 	 else \
 	     ./sbin/install-package ; \
 	 fi
diff -Nur mpich2-1.0.7/src/mpe2/src/slog2sdk/trace_sample/Makefile.in mpich2-1.0.7.new/src/mpe2/src/slog2sdk/trace_sample/Makefile.in
--- mpich2-1.0.7/src/mpe2/src/slog2sdk/trace_sample/Makefile.in	2008-03-12 17:43:05.000000000 -0700
+++ mpich2-1.0.7.new/src/mpe2/src/slog2sdk/trace_sample/Makefile.in	2008-06-22 11:14:41.000000000 -0700
@@ -7,8 +7,8 @@
 	cd src && $(MAKE)
 
 install:
-	@if [ -n "$(PREFIX)" ] ; then \
-	     ./sbin/install-package -prefix=$(PREFIX) ; \
+	@if [ -n "$(prefix)" ] ; then \
+	     ./sbin/install-package -prefix=$(prefix) ; \
 	 else \
 	     ./sbin/install-package ; \
 	 fi
diff -Nur mpich2-1.0.7/src/mpi/romio/Makefile.in mpich2-1.0.7.new/src/mpi/romio/Makefile.in
--- mpich2-1.0.7/src/mpi/romio/Makefile.in	2008-03-10 15:38:31.000000000 -0700
+++ mpich2-1.0.7.new/src/mpi/romio/Makefile.in	2008-06-22 11:14:37.000000000 -0700
@@ -134,11 +134,11 @@
 
 install:
 	$(MAKE) clean
-	@./util/romioinstall -prefix=$(PREFIX)
+	@./util/romioinstall -prefix=$(prefix)
 
 # LAM added uninstall target
 uninstall:
-	@./util/romioinstall -prefix=$(PREFIX) -uninstall
+	@./util/romioinstall -prefix=$(prefix) -uninstall
 
 # FIXME: To avoid problems with noisy make programs, these should be accessed
 # through entries in localdefs .