--- Makefile.in.orig	2006-05-20 21:49:41.000000000 -0700
+++ Makefile.in	2006-05-20 22:12:04.000000000 -0700
@@ -229,9 +229,12 @@
 	if [ -s lib/lib${MPICXXLIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${MPICXXLIBNAME}.a ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.a ; fi
 	if [ -s lib/lib${PMPILIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${PMPILIBNAME}.a ${DESTDIR}${libdir}/lib${PMPILIBNAME}.a ; fi
 	if [ -s lib/libf${MPILIBNAME}.a ] ; then $(INSTALL_DATA) lib/libf${MPILIBNAME}.a ${DESTDIR}${libdir}/libf${MPILIBNAME}.a ; fi
-	if [ -s lib/lib${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@ ; fi
-	if [ -s lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@ ; fi
-	if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@ ; fi
+	if [ -s lib/lib${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@.0.0 ; fi
+	if [ -s lib/lib${MPILIBNAME}.@SHLIB_EXT@ ] ; then cd ${DESTDIR}${libdir} ; ln -sf lib${MPILIBNAME}.@SHLIB_EXT@.0.0 lib${MPILIBNAME}.@SHLIB_EXT@ ; cd - ; fi
+	if [ -s lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@.0.0 ; fi
+	if [ -s lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ] ; then cd ${DESTDIR}${libdir} ; ln -sf lib${PMPILIBNAME}.@SHLIB_EXT@.0.0 lib${PMPILIBNAME}.@SHLIB_EXT@ ; cd - ; fi
+	if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@.0.0 ; fi
+	if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then cd ${DESTDIR}${libdir} ; ln -sf libf${MPILIBNAME}.@SHLIB_EXT@.0.0 libf${MPILIBNAME}.@SHLIB_EXT@ ; cd - ; fi
 	if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi
 	if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
 	if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
@@ -258,9 +261,9 @@
 	-rm -f ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.a
 	-rm -f ${DESTDIR}${libdir}/lib${PMPILIBNAME}.a
 	-rm -f ${DESTDIR}${libdir}/libf${MPILIBNAME}.a
-	-rm -f ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@
-	-rm -f ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@
-	-rm -f ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@
+	-rm -f ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@*
+	-rm -f ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@*
+	-rm -f ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@*
 	-rm -f ${DESTDIR}${docdir}/user.pdf
 	-rm -f ${DESTDIR}${docdir}/install.pdf
 	-rm -f ${DESTDIR}${docdir}/smpd_pmi.pdf
--- Makefile.in.orig	2006-05-20 15:59:26.000000000 -0700
+++ Makefile.in	2006-05-20 16:06:24.000000000 -0700
@@ -428,11 +428,11 @@
 install-local:
 	-if [ "@BUILD_TVDLL@" = "yes" ] ; then \
 	    $(INSTALL_DATA) src/mpi/debugger/libtvmpich.@SHLIB_EXT@ \
-			${libdir}/libtvmpich.@SHLIB_EXT@ ; fi
-	if test ! -d ${exec_prefix}/examples ; then \
-	    $(MKDIR_P) ${exec_prefix}/examples ; \
+			${DESTDIR}${libdir}/libtvmpich.@SHLIB_EXT@ ; fi
+	if test ! -d ${DESTDIR}${exec_prefix}/examples ; then \
+	    $(MKDIR_P) ${DESTDIR}${exec_prefix}/examples ; \
 	fi
-	$(INSTALL_PROGRAM) examples/cpi ${exec_prefix}/examples/cpi
+	$(INSTALL_PROGRAM) examples/cpi ${DESTDIR}${exec_prefix}/examples/cpi
 
 install-devdocs:
 	(cd doc && $(MAKE) install-devdocs)
--- src/pm/mpd/Makefile.in.orig	2005-10-24 12:08:40.000000000 -0700
+++ src/pm/mpd/Makefile.in	2006-05-21 11:12:37.000000000 -0700
@@ -119,7 +119,7 @@
 	@echo "copying python files/links into " $(DESTDIR)${bindir}
 	-@for cmd in ${PYTHON_SOURCE} ; do \
 	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
-	    ${INSTALL} -m 755 ${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
+	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
 	    ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
 	done
 	-@cd $(DESTDIR)${bindir} && rm -f mpd