*** .mpich/util/mpiinstall.in	Fri Jul 26 15:19:35 1996
--- mpiinstall.in	Mon Jul 29 14:00:47 1996
***************
*** 45,54 ****
  	-manpath=*)MPIMANPATH=`echo $arg | sed -e 's/-manpath=//g'` ;;
  	-libonly) libonly=1 ;;
  	-t) Show=echo
  	    just_testing=1
  	    ;;
! 	-help|-u|-usage)
  	echo "Install MPICH into $PREFIX."
  	echo "-mode=nnnn   - mode for regular files.  Default is $MODE ."
  	echo "-xmode=nnnn  - mode for execuables and directories.  Default is $XMODE ."
  	echo "-prefix=path - Destination directory."
--- 45,55 ----
  	-manpath=*)MPIMANPATH=`echo $arg | sed -e 's/-manpath=//g'` ;;
  	-libonly) libonly=1 ;;
  	-t) Show=echo
  	    just_testing=1
+ 	    failmode="soft"
  	    ;;
! 	-help|-u|-usage|-h)
  	echo "Install MPICH into $PREFIX."
  	echo "-mode=nnnn   - mode for regular files.  Default is $MODE ."
  	echo "-xmode=nnnn  - mode for execuables and directories.  Default is $XMODE ."
  	echo "-prefix=path - Destination directory."
***************
*** 75,82 ****
--- 76,99 ----
  if [ -z "$APREFIX" ] ; then
      APREFIX=$PREFIX
  fi
  #
+ # If libonly, we need to get the correct default machine etc.  We could 
+ # get this from the config.status for the device, but the problem is that
+ # there are MANY items to restore.  A better approach is to use an install
+ # script from the library directory itself.
+ if [ -n "$libonly" ] ; then
+ #   trialname=`sed -n -e "s/DEFAULT_MACHINE='\(.*\)'/\1/p" \
+ #	lib/$ARCH/$COMM/config.status`
+ #   if [ -n "$trialname" ] ; then 
+ #	DEFAULT_MACHINE="$trialname"
+ #   fi
+     if [ -x lib/$ARCH/$COMM/mpiinstall ] ; then
+         . lib/$ARCH/$COMM/mpiinstall "$@"
+         exit $?
+     fi
+ fi
+ #
  # Update some fields that contain the build root directory
  # These work by extracting the syntax for specifying the library, and then
  # adding the correct destination to it.
  NFLIB_PATH=`echo "@FLIB_PATH@" | \
***************
*** 502,509 ****
--- 519,544 ----
  # Libaries
  for file in lib/$ARCH/$COMM/*.a ; do
      $Show CopyFileP $file $PREFIX/lib/$ARCH/$COMM
  done
+ #
+ # Message files
+ if [ -z "$libonly" ] ; then 
+     # Note that we need to get the mpich.*.m files for IRIX which has
+     # a message file directory as well as the message file.
+     for file in lib/$ARCH/mpich.* ; do
+         if [ $file = "mpich.cat" ] ; then
+ 	    # This is a link; it assumes that En_US is the default.
+             if [ -f lib/$ARCH/mpich.En_US.cat ] ; then 
+                 $Show ln -s $PREFIX/lib/$ARCH/mpich.En_US.cat \
+ 	   		    $PREFIX/lib/$ARCH/mpich.cat
+             fi
+         else
+             $Show CopyFile $file $PREFIX/lib/$ARCH
+         fi
+     done
+ fi
+     
  # Other files in lib need to be updated...
  #
  # Documentation
  # Note that we're not doing the www pages yet.