parallel/mpi-ch/patches/patch-al

   1 $NetBSD$
   2
   3 --- util/mpiinstall.in.orig     Sun Jul 12 08:28:14 1998
   4 +++ util/mpiinstall.in  Tue Oct 20 14:57:33 1998
   5 @@ -120,12 +120,12 @@
   6  # script from the library directory itself.
   7  if [ -n "$libonly" ] ; then
   8  #   trialname=`sed -n -e "s/DEFAULT_MACHINE='\(.*\)'/\1/p" \
   9 -#      lib/$ARCH/$COMM/config.status`
  10 +#      libdata/$ARCH/$COMM/config.status`
  11  #   if [ -n "$trialname" ] ; then
  12  #      DEFAULT_MACHINE="$trialname"
  13  #   fi
  14 -    if [ $inlib = 0 -a -x lib/$ARCH/$COMM/mpiinstall ] ; then
  15 -        ./lib/$ARCH/$COMM/mpiinstall -inlib "$@"
  16 +    if [ $inlib = 0 -a -x libdata/$ARCH/$COMM/mpiinstall ] ; then
  17 +        ./libdata/$ARCH/$COMM/mpiinstall -inlib "$@"
  18          exit $?
  19      fi
  20  fi
  21 @@ -134,15 +134,15 @@
  22  # These work by extracting the syntax for specifying the library, and then
  23  # adding the correct destination to it.
  24  NFLIB_PATH=`echo "@FLIB_PATH@" | \
  25 -       sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/lib/$ARCH/$COMM%g"`
  26 +       sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/libdata/$ARCH/$COMM%g"`
  27  NF90LIB_PATH=`echo "@F90LIB_PATH@" | \
  28 -       sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/lib/$ARCH/$COMM%g"`
  29 +       sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/libdata/$ARCH/$COMM%g"`
  30  NF90INC=`echo "@F90INC@" | \
  31         sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/include%g"`
  32  # This one is especially tricky because the default include path goes to the
  33  # source directory for the C++ interface
  34  NCPPFLAGS=`echo "A$CPPFLAGS" | \
  35 -    sed -e "s%-I.*/MPI-2-C++/src%-I$PREFIX/lib/$ARCH/$COMM/c++%g" \
  36 +    sed -e "s%-I.*/MPI-2-C++/src%-I$PREFIX/libdata/$ARCH/$COMM/c++%g" \
  37          -e "s/^A//g"`
  38  #
  39  # Remove old uninstall file
  40 @@ -269,9 +269,10 @@
  41      if [ -f $dest ] ; then $Show /bin/rm -f $dest ; fi
  42      if [ $just_testing = 0 ] ; then
  43          sed \
  44 +       -e "s%/lib/%/libdata/%g" \
  45         -e "s%\#ARCH\#%$ARCH%g" \
  46         -e "s%\#AUTOMOUNTFIX\#%@AUTOMOUNTFIX@%g" \
  47 -        -e "s%\#BITMAP_DIR\#%$PREFIX/lib/bitmaps%g" \
  48 +        -e "s%\#BITMAP_DIR\#%$PREFIX/libdata/bitmaps%g" \
  49         -e "s%\#CC\#%@CC@%g" \
  50         -e "s%\#CFLAGS\#%@CFLAGS@%g" \
  51         -e "s%\#USER_CFLAGS\#%@USER_CFLAGS@%g" \
  52 @@ -280,7 +281,7 @@
  53         -e "s%\#DEFAULT_ARCH\#%$ARCH%g" \
  54         -e "s%\#DEFAULT_DEVICE\#%$DEVICE%g" \
  55         -e "s%\#DEFAULT_MACHINE\#%$DEFAULT_MACHINE%g" \
  56 -               -e "s%\#EXECER_DIR\#%$PREFIX/util%g" \
  57 +               -e "s%\#EXECER_DIR\#%$PREFIX/share/util%g" \
  58         -e "s%\#F77\#%@F77@%g" \
  59         -e "s%\#FFLAGS\#%@FFLAGS@%g" \
  60         -e "s%\#FLIB_PATH_LEADER\#%@FLIB_PATH_LEADER@%g" \
  61 @@ -342,7 +343,7 @@
  62      # the LIB_PATH to contain multiple names, as long as the MPICH libpath
  63      # is first
  64      NLIBPATH=`echo "@LIB_PATH@" | \
  65 -       sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/lib/$ARCH/$COMM%g"`
  66 +       sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/libdata/$ARCH/$COMM%g"`
  67  if [ -d $2 ] ; then
  68      dest=$2/`basename $1`
  69  else
  70 @@ -356,11 +357,12 @@
  71      if [ -f $dest ] ; then $Show /bin/rm -f $dest ; fi
  72      if [ $just_testing = 0 ] ; then
  73          sed \
  74 +       -e "s%/lib/%/libdata/%g" \
  75         -e "s%[@]ARCH[@]%$ARCH%g" \
  76         -e "s%[@]AUTOMOUNTFIX[@]%@AUTOMOUNTFIX@%g" \
  77         -e "s%[@]FINC[@]%$NFINC%g" \
  78         -e "s%[@]F90INC[@]%$NF90INC%g" \
  79 -        -e "s%[@]BITMAP_DIR[@]%$PREFIX/lib/bitmaps%g" \
  80 +        -e "s%[@]BITMAP_DIR[@]%$PREFIX/libdata/bitmaps%g" \
  81         -e "s%[@]CC[@]%@CC@%g" \
  82         -e "s%[@]CCC[@]%@CCC@%g" \
  83         -e "s%[@]CPP_COMPILER[@]%@CPP_COMPILER@%g" \
  84 @@ -375,7 +377,7 @@
  85         -e "s%[@]DEFAULT_ARCH[@]%$ARCH%g" \
  86         -e "s%[@]DEFAULT_DEVICE[@]%$DEVICE%g" \
  87         -e "s%[@]DEFAULT_MACHINE[@]%$DEFAULT_MACHINE%g" \
  88 -               -e "s%[@]EXECER_DIR[@]%$PREFIX/util%g" \
  89 +               -e "s%[@]EXECER_DIR[@]%$PREFIX/share/util%g" \
  90         -e "s%[@]F77[@]%@F77@%g" \
  91         -e "s%[@]FFLAGS[@]%@FFLAGS@%g" \
  92         -e "s%[@]FLIB_PATH_LEADER[@]%@FLIB_PATH_LEADER@%g" \
  93 @@ -455,22 +457,23 @@
  94      MkDir $PREFIX
  95  fi
  96
  97 -MkDir $PREFIX/lib
  98 -MkDir $PREFIX/lib/$ARCH
  99 -MkDir $PREFIX/lib/$ARCH/$COMM
 100 -MkDir $PREFIX/lib/bitmaps
 101 +MkDir $PREFIX/libdata
 102 +MkDir $PREFIX/libdata/$ARCH
 103 +MkDir $PREFIX/libdata/$ARCH/$COMM
 104 +MkDir $PREFIX/libdata/bitmaps
 105  if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then
 106 -    MkDir $PREFIX/$CPP_DIR
 107 -    MkDir $PREFIX/$CPP_DIR/examples
 108 -    MkDir $PREFIX/lib/$ARCH/$COMM/c++
 109 +#    MkDir $PREFIX/libdata/$CPP_DIR
 110 +    MkDir $PREFIX/share/examples/$CPP_DIR
 111 +    MkDir $PREFIX/libdata/$ARCH/$COMM/c++
 112  fi
 113 -MkDir $PREFIX/util
 114 -MkDir $PREFIX/util/machines
 115 +MkDir $PREFIX/share/util
 116 +MkDir $PREFIX/share/util/machines
 117  MkDir $PREFIX/include
 118 -MkDir $PREFIX/examples
 119 +MkDir $PREFIX/share/examples/mpi
 120  MkDir $PREFIX/bin
 121  MkDir $PREFIX/man
 122 -MkDir $PREFIX/doc
 123 +MkDir $PREFIX/share/doc
 124 +MkDir $PREFIX/share/doc/mpi
 125  if [ -z "$libonly" ] ; then
 126      CopyFile bin/tarch $PREFIX/bin $XMODE
 127      CopyFile bin/tdevice $PREFIX/bin $XMODE
 128 @@ -478,7 +481,7 @@
 129      # mpiman
 130      $Show /bin/rm -f $PREFIX/bin/mpiman
 131      FixupFile util/mpiman.in $PREFIX/bin/mpiman $XMODE
 132 -    CopyFile $PREFIX/bin/mpiman $PREFIX/lib/$ARCH/$COMM $XMODE
 133 +    CopyFile $PREFIX/bin/mpiman $PREFIX/libdata/$ARCH/$COMM $XMODE
 134      #
 135      # Upshot and Nupshot
 136      # Do Upshot/Nupshot early in case there is a problem.
 137 @@ -488,7 +491,7 @@
 138          #
 139          # Should clean nupshot sources  (*.c/h)
 140          if [ -n "@TCL_DIR@" -a -z "$cpnupshot" -a -n "@TK_DIR@" -a \
 141 -          "@TK_VERSION@" = "3.6" ] ; then
 142 +          "@TK_VERSION@" = "8.0" ] ; then
 143              echo "Attempting to build nupshot... "
 144              $Show $CPRP -r mpe/profiling/nupshot $PREFIX
 145             echo "/bin/rm -rf $PREFIX/nupshot" >> $UNINSTALLFILE
 146 @@ -526,16 +529,16 @@
 147              echo "Creating $PREFIX/bin/$bfile from $file"
 148          fi
 149          FixupFile $file $PREFIX/bin/$bfile $XMODE
 150 -        $Show /bin/rm -f $PREFIX/lib/$ARCH/$COMM/$bfile
 151 -        CopyFile $PREFIX/bin/$bfile $PREFIX/lib/$ARCH/$COMM $XMODE
 152 +        $Show /bin/rm -f $PREFIX/libdata/$ARCH/$COMM/$bfile
 153 +        CopyFile $PREFIX/bin/$bfile $PREFIX/libdata/$ARCH/$COMM $XMODE
 154      done
 155      $Show mv $PREFIX/bin/mpirun.sh $PREFIX/bin/mpirun
 156      echo "/bin/rm -f $PREFIX/bin/mpirun" >> $UNINSTALLFILE
 157 -    $Show mv $PREFIX/lib/$ARCH/$COMM/mpirun.sh $PREFIX/lib/$ARCH/$COMM/mpirun
 158 -    echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/mpirun" >> $UNINSTALLFILE
 159 -    if [ ! -r $PREFIX/lib/$ARCH/$COMM/tarch ] ; then
 160 -       ( cd $PREFIX/lib/$ARCH/$COMM ;  ln -s ../../../bin/tarch tarch )
 161 -        echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/tarch" >> $UNINSTALLFILE
 162 +    $Show mv $PREFIX/libdata/$ARCH/$COMM/mpirun.sh $PREFIX/libdata/$ARCH/$COMM/mpirun
 163 +    echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/mpirun" >> $UNINSTALLFILE
 164 +    if [ ! -r $PREFIX/libdata/$ARCH/$COMM/tarch ] ; then
 165 +       ( cd $PREFIX/libdata/$ARCH/$COMM ;      ln -s ../../../bin/tarch tarch )
 166 +        echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/tarch" >> $UNINSTALLFILE
 167      fi
 168      #
 169      $Show /bin/rm -f $PREFIX/bin/mpireconfig
 170 @@ -543,22 +546,22 @@
 171          echo "Creating mpireconfig from util/mpireconfig.in"
 172      fi
 173      FixupFile util/mpireconfig.in $PREFIX/bin/mpireconfig $XMODE
 174 -    CopyFile $PREFIX/bin/mpireconfig $PREFIX/lib/$ARCH/$COMM $XMODE
 175 +    CopyFile $PREFIX/bin/mpireconfig $PREFIX/libdata/$ARCH/$COMM $XMODE
 176      $Show /bin/rm -f $PREFIX/bin/execer
 177      CopyFile util/execer $PREFIX/bin/execer $XMODE
 178      #
 179      # mpicc, mpif77, mpif90
 180      FixupFileWithAt util/mpicc.in $PREFIX/bin/mpicc $XMODE
 181 -    CopyFile $PREFIX/bin/mpicc $PREFIX/lib/$ARCH/$COMM $XMODE
 182 +    CopyFile $PREFIX/bin/mpicc $PREFIX/libdata/$ARCH/$COMM $XMODE
 183      FixupFileWithAt util/mpif77.in $PREFIX/bin/mpif77 $XMODE
 184 -    CopyFile $PREFIX/bin/mpif77 $PREFIX/lib/$ARCH/$COMM $XMODE
 185 +    CopyFile $PREFIX/bin/mpif77 $PREFIX/libdata/$ARCH/$COMM $XMODE
 186      FixupFileWithAt util/mpif90.in $PREFIX/bin/mpif90 $XMODE
 187 -    CopyFile $PREFIX/bin/mpif90 $PREFIX/lib/$ARCH/$COMM $XMODE
 188 +    CopyFile $PREFIX/bin/mpif90 $PREFIX/libdata/$ARCH/$COMM $XMODE
 189      #
 190      # mpiCC, if C++ selected
 191      if [ -n "@CPP_COMPILER@" ] ; then
 192         FixupFileWithAt util/mpiCC.in $PREFIX/bin/mpiCC $XMODE
 193 -        CopyFile $PREFIX/bin/mpiCC $PREFIX/lib/$ARCH/$COMM $XMODE
 194 +        CopyFile $PREFIX/bin/mpiCC $PREFIX/libdata/$ARCH/$COMM $XMODE
 195      fi
 196  else
 197      # libonly
 198 @@ -568,28 +571,28 @@
 199      for file in util/mpirun.*.in util/tstmachines.in ; do
 200          bfile=`basename $file .in`
 201          if [ $verbose = 1 ] ; then
 202 -            echo "Creating $PREFIX/lib/$ARCH/$COMM/$bfile from $file"
 203 +            echo "Creating $PREFIX/libdata/$ARCH/$COMM/$bfile from $file"
 204         fi
 205 -        FixupFile $file $PREFIX/lib/$ARCH/$COMM/$bfile $XMODE
 206 +        FixupFile $file $PREFIX/libdata/$ARCH/$COMM/$bfile $XMODE
 207      done
 208 -    $Show mv $PREFIX/lib/$ARCH/$COMM/mpirun.sh $PREFIX/lib/$ARCH/$COMM/mpirun
 209 -    if [ ! -r $PREFIX/lib/$ARCH/$COMM/tarch ] ; then
 210 -       ( cd $PREFIX/lib/$ARCH/$COMM ;  ln -s ../../../bin/tarch tarch )
 211 -        echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/tarch" >> $UNINSTALLFILE
 212 +    $Show mv $PREFIX/libdata/$ARCH/$COMM/mpirun.sh $PREFIX/libdata/$ARCH/$COMM/mpirun
 213 +    if [ ! -r $PREFIX/libdata/$ARCH/$COMM/tarch ] ; then
 214 +       ( cd $PREFIX/libdata/$ARCH/$COMM ;      ln -s ../../../bin/tarch tarch )
 215 +        echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/tarch" >> $UNINSTALLFILE
 216      fi
 217 -    FixupFileWithAt util/mpicc.in $PREFIX/lib/$ARCH/$COMM/mpicc $XMODE
 218 +    FixupFileWithAt util/mpicc.in $PREFIX/libdata/$ARCH/$COMM/mpicc $XMODE
 219      if [ -n "@CPP_COMPILER@" ] ; then
 220 -        FixupFileWithAt util/mpiCC.in $PREFIX/lib/$ARCH/$COMM/mpiCC $XMODE
 221 +        FixupFileWithAt util/mpiCC.in $PREFIX/libdata/$ARCH/$COMM/mpiCC $XMODE
 222      fi
 223 -    FixupFileWithAt util/mpif77.in $PREFIX/lib/$ARCH/$COMM/mpif77 $XMODE
 224 -    FixupFileWithAt util/mpif90.in $PREFIX/lib/$ARCH/$COMM/mpif90 $XMODE
 225 -    FixupFile util/mpireconfig.in $PREFIX/lib/$ARCH/$COMM/mpireconfig $XMODE
 226 -    CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/lib/$ARCH/$COMM
 227 -    CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/lib/$ARCH/$COMM
 228 -    CopyFile lib/$ARCH/$COMM/mpif.h    $PREFIX/lib/$ARCH/$COMM
 229 +    FixupFileWithAt util/mpif77.in $PREFIX/libdata/$ARCH/$COMM/mpif77 $XMODE
 230 +    FixupFileWithAt util/mpif90.in $PREFIX/libdata/$ARCH/$COMM/mpif90 $XMODE
 231 +    FixupFile util/mpireconfig.in $PREFIX/libdata/$ARCH/$COMM/mpireconfig $XMODE
 232 +    CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/libdata/$ARCH/$COMM
 233 +    CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/libdata/$ARCH/$COMM
 234 +    CopyFile lib/$ARCH/$COMM/mpif.h    $PREFIX/libdata/$ARCH/$COMM
 235      if [ -s romio/include/mpio.h ] ; then
 236 -        CopyFile romio/include/mpio.h $PREFIX/lib/$ARCH/$COMM
 237 -        CopyFile romio/include/mpiof.h $PREFIX/lib/$ARCH/$COMM
 238 +        CopyFile romio/include/mpio.h $PREFIX/libdata/$ARCH/$COMM
 239 +        CopyFile romio/include/mpiof.h $PREFIX/libdata/$ARCH/$COMM
 240      fi
 241  fi
 242  #
 243 @@ -599,12 +602,12 @@
 244      echo "Attempting to build ch_p4 secure server"
 245      $Show "( cd mpid/ch_p4/p4/servers ; $MAKE serv_p4 ; )"
 246      CopyFile mpid/ch_p4/p4/bin/serv_p4 $PREFIX/bin $XMODE
 247 -    CopyFile $PREFIX/bin/serv_p4 $PREFIX/lib/$ARCH/$COMM $XMODE
 248 +    CopyFile $PREFIX/bin/serv_p4 $PREFIX/libdata/$ARCH/$COMM $XMODE
 249      $Show /bin/rm -f util/chp4_servs
 250 -    FixupFile util/chp4_servs.in $PREFIX/util/chp4_servs $XMODE
 251 -    CopyFile $PREFIX/util/chp4_servs $PREFIX/lib/$ARCH/$COMM $XMODE
 252 -    CopyFile util/chkserv $PREFIX/util/chkserv $XMODE
 253 -    CopyFile $PREFIX/util/chkserv $PREFIX/lib/$ARCH/$COMM $XMODE
 254 +    FixupFile util/chp4_servs.in $PREFIX/share/util/chp4_servs $XMODE
 255 +    CopyFile $PREFIX/share/util/chp4_servs $PREFIX/libdata/$ARCH/$COMM $XMODE
 256 +    CopyFile util/chkserv $PREFIX/share/util/chkserv $XMODE
 257 +    CopyFile $PREFIX/share/util/chkserv $PREFIX/libdata/$ARCH/$COMM $XMODE
 258  fi
 259  #
 260  # P4
 261 @@ -615,12 +618,12 @@
 262      fi
 263      if [ -x mpid/server/server ] ; then
 264         CopyFile mpid/server/server $PREFIX/bin $XMODE
 265 -        CopyFile mpid/server/server $PREFIX/lib/$ARCH/$COMM $XMODE
 266 +        CopyFile mpid/server/server $PREFIX/libdata/$ARCH/$COMM $XMODE
 267         $Show /bin/rm -f util/chp4_servs
 268 -       FixupFile util/chp4_servs.in $PREFIX/util/chp4_servs $XMODE
 269 -       CopyFile $PREFIX/util/chp4_servs $PREFIX/lib/$ARCH/$COMM $XMODE
 270 -       CopyFile util/chkserv $PREFIX/util/chkserv $XMODE
 271 -       CopyFile $PREFIX/util/chkserv $PREFIX/lib/$ARCH/$COMM $XMODE
 272 +       FixupFile util/chp4_servs.in $PREFIX/share/util/chp4_servs $XMODE
 273 +       CopyFile $PREFIX/share/util/chp4_servs $PREFIX/libdata/$ARCH/$COMM $XMODE
 274 +       CopyFile util/chkserv $PREFIX/share/util/chkserv $XMODE
 275 +       CopyFile $PREFIX/share/util/chkserv $PREFIX/libdata/$ARCH/$COMM $XMODE
 276      else
 277          echo "Server not available"
 278      fi
 279 @@ -629,15 +632,15 @@
 280  if [ -z "$libonly" ] ; then
 281      #
 282      # Machines database
 283 -    #  if [ ! -d $PREFIX/util/machines.anl ] ; then \
 284 -    #      mkdir $PREFIX/util/machines.anl ; fi
 285 -    #  $CPRP -r util/machines $PREFIX/util/machines.anl
 286 +    #  if [ ! -d $PREFIX/share/util/machines.anl ] ; then \
 287 +    #      mkdir $PREFIX/share/util/machines.anl ; fi
 288 +    #  $CPRP -r util/machines $PREFIX/share/util/machines.anl
 289      for file in util/machines/machines* ; do
 290 -        CopyFile $file $PREFIX/util/machines
 291 +        CopyFile $file $PREFIX/share/util/machines
 292      done
 293      for file in mpe/profiling/upshot/bitmaps/* ; do
 294         if [ -f $file ] ; then
 295 -            CopyFile $file $PREFIX/lib/bitmaps
 296 +            CopyFile $file $PREFIX/libdata/bitmaps
 297         fi
 298      done
 299      #
 300 @@ -649,33 +652,33 @@
 301      CopyFile include/protofix.h $PREFIX/include
 302      CopyFile include/mpeexten.h $PREFIX/include
 303      CopyFile include/patchlevel.h $PREFIX/include
 304 -    CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/lib/$ARCH/$COMM
 305 -    CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/lib/$ARCH/$COMM
 306 +    CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/libdata/$ARCH/$COMM
 307 +    CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/libdata/$ARCH/$COMM
 308      CopyFile mpe/mpe.h $PREFIX/include
 309      CopyFile mpe/mpe_graphics.h $PREFIX/include
 310      CopyFile mpe/mpe_log.h $PREFIX/include
 311      CopyFile mpe/mpetools.h $PREFIX/include
 312      CopyFile mpe/basex11.h $PREFIX/include
 313      if [ -s romio/include/mpio.h ] ; then
 314 -        CopyFile romio/include/mpio.h $PREFIX/lib/$ARCH/$COMM
 315 -        CopyFile romio/include/mpiof.h $PREFIX/lib/$ARCH/$COMM
 316 +        CopyFile romio/include/mpio.h $PREFIX/libdata/$ARCH/$COMM
 317 +        CopyFile romio/include/mpiof.h $PREFIX/libdata/$ARCH/$COMM
 318      fi
 319  fi
 320  #
 321  # Include files for C++
 322  if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then
 323 -    if [ ! -d $PREFIX/lib/$ARCH/$COMM/c++ ] ; then
 324 -        MkDir $PREFIX/lib/$ARCH/$COMM/c++
 325 +    if [ ! -d $PREFIX/libdata/$ARCH/$COMM/c++ ] ; then
 326 +        MkDir $PREFIX/libdata/$ARCH/$COMM/c++
 327      fi
 328      for file in `ls MPI-2-C++/src/*.h`; do
 329 -        CopyFile $file $PREFIX/lib/$ARCH/$COMM/c++
 330 +        CopyFile $file $PREFIX/libdata/$ARCH/$COMM/c++
 331      done
 332  fi
 333  #
 334  # Libaries (includeing shared libraries)
 335  for file in lib/$ARCH/$COMM/*.a lib/$ARCH/$COMM/*.so* ; do
 336      if [ -f $file ] ; then
 337 -        CopyFileP $file $PREFIX/lib/$ARCH/$COMM
 338 +        CopyFileP $file $PREFIX/libdata/$ARCH/$COMM
 339      fi
 340  done
 341  #
 342 @@ -684,7 +687,7 @@
 343  #     spxcp - Executable copy program for IBM SP.
 344  for file in spxcp ; do
 345      if [ -x lib/$ARCH/$COMM/$file ] ; then
 346 -        CopyFileP lib/$ARCH/$COMM/$file $PREFIX/lib/$ARCH/$COMM
 347 +        CopyFileP lib/$ARCH/$COMM/$file $PREFIX/libdata/$ARCH/$COMM
 348      fi
 349  done
 350  #
 351 @@ -696,18 +699,18 @@
 352          if [ $file = "mpich.cat" ] ; then
 353             # This is a link; it assumes that En_US is the default.
 354              if [ -f lib/$ARCH/mpich.En_US.cat ] ; then
 355 -                $Show ln -s $PREFIX/lib/$ARCH/mpich.En_US.cat \
 356 -                           $PREFIX/lib/$ARCH/mpich.cat
 357 +                $Show ln -s $PREFIX/libdata/$ARCH/mpich.En_US.cat \
 358 +                           $PREFIX/libdata/$ARCH/mpich.cat
 359              fi
 360          elif [ -s $file ] ; then
 361             # This will handle the case of no mpich.* matches
 362 -            CopyFile $file $PREFIX/lib/$ARCH
 363 +            CopyFile $file $PREFIX/libdata/$ARCH
 364          fi
 365      done
 366  fi
 367
 368  # Other files in lib need to be updated...
 369 -CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/lib/$ARCH/$COMM
 370 +CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/libdata/$ARCH/$COMM
 371  #
 372  # Documentation
 373  # Note that we're not doing the www pages yet.
 374 @@ -735,15 +738,15 @@
 375  if [ -z "$libonly" ] ; then
 376      for file in functions.ps.Z guide.ps.Z install.ps.Z ; do
 377         if [ -f $file ] ; then
 378 -            CopyFile doc/$file $PREFIX/doc
 379 +            CopyFile doc/$file $PREFIX/share/doc/mpi
 380         fi
 381      done
 382      #$Show $CPRP -r doc $PREFIX
 383      if [ -f ref/adiman.ps.Z ] ; then
 384 -        CopyFile ref/adiman.ps.Z $PREFIX/doc
 385 +        CopyFile ref/adiman.ps.Z $PREFIX/share/doc/mpi
 386      fi
 387      if [ -f ref/mpiman.ps.Z ] ; then
 388 -        CopyFile ref/mpiman.ps.Z $PREFIX/doc
 389 +        CopyFile ref/mpiman.ps.Z $PREFIX/share/doc/mpi
 390      fi
 391  fi
 392  #
 393 @@ -755,94 +758,94 @@
 394  if [ $just_testing = 0 ] ; then
 395      cat lib/$ARCH/$COMM/config.status | \
 396         sed -e "s%MPIR_HOME=.*\$%MPIR_HOME='$PREFIX'%g" \
 397 -    -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \
 398 -    -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \
 399 +    -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \
 400 +    -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \
 401                 -e "s%MPE_DIR=.*\$%MPE_DIR='$PREFIX/mpe'%g" \
 402 -    -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/lib/$ARCH/$COMM/mpicc%g" \
 403 -    -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/lib/$ARCH/$COMM/mpif77%g" \
 404 -    -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/lib/$ARCH/$COMM/mpif90%g" \
 405 -    -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/lib/$ARCH/$COMM/mpiCC%g" \
 406 -                       > $PREFIX/lib/$ARCH/$COMM/config.status
 407 -    echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/config.status" >> $UNINSTALLFILE
 408 -    chmod $XMODE $PREFIX/lib/$ARCH/$COMM/config.status
 409 +    -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/libdata/$ARCH/$COMM/mpicc%g" \
 410 +    -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/libdata/$ARCH/$COMM/mpif77%g" \
 411 +    -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/libdata/$ARCH/$COMM/mpif90%g" \
 412 +    -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/libdata/$ARCH/$COMM/mpiCC%g" \
 413 +                       > $PREFIX/libdata/$ARCH/$COMM/config.status
 414 +    echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/config.status" >> $UNINSTALLFILE
 415 +    chmod $XMODE $PREFIX/libdata/$ARCH/$COMM/config.status
 416  else
 417  cat <<.
 418  cat lib/$ARCH/$COMM/config.status | \
 419         sed -e "s%MPIR_HOME=.*\$%MPIR_HOME='$PREFIX'%g" \
 420 -    -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \
 421 -    -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \
 422 +    -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \
 423 +    -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \
 424                 -e "s%MPE_DIR=.*\$%MPE_DIR='$PREFIX/mpe'%g" \
 425 -    -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/lib/$ARCH/$COMM/mpicc%g" \
 426 -    -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/lib/$ARCH/$COMM/mpif77%g" \
 427 -    -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/lib/$ARCH/$COMM/mpif90%g" \
 428 -    -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/lib/$ARCH/$COMM/mpiCC%g" \
 429 -                       > $PREFIX/lib/$ARCH/$COMM/config.status
 430 -    chmod $XMODE $PREFIX/lib/$ARCH/$COMM/config.status
 431 +    -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/libdata/$ARCH/$COMM/mpicc%g" \
 432 +    -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/libdata/$ARCH/$COMM/mpif77%g" \
 433 +    -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/libdata/$ARCH/$COMM/mpif90%g" \
 434 +    -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/libdata/$ARCH/$COMM/mpiCC%g" \
 435 +                       > $PREFIX/libdata/$ARCH/$COMM/config.status
 436 +    chmod $XMODE $PREFIX/libdata/$ARCH/$COMM/config.status
 437  .
 438  fi
 439  if [ -z "$libonly" ] ; then
 440 -    #CopyFile $PREFIX/lib/$ARCH/$COMM/config.status $PREFIX
 441 +    #CopyFile $PREFIX/libdata/$ARCH/$COMM/config.status $PREFIX
 442      #
 443 -    $Show /bin/rm -f $PREFIX/examples/mpif.h
 444 -    $Show ln -s $PREFIX/include/mpif.h $PREFIX/examples/mpif.h
 445 -    echo "/bin/rm -f $PREFIX/examples/mpif.h" >> $UNINSTALLFILE
 446 +    $Show /bin/rm -f $PREFIX/share/examples/mpi/mpif.h
 447 +    $Show ln -s $PREFIX/include/mpif.h $PREFIX/share/examples/mpi/mpif.h
 448 +    echo "/bin/rm -f $PREFIX/share/examples/mpi/mpif.h" >> $UNINSTALLFILE
 449  fi
 450  #
 451  # Example programs
 452 -CopyFile installtest/Makefile.in $PREFIX/examples
 453 +CopyFile installtest/Makefile.in $PREFIX/share/examples/mpi
 454  #
 455  # This SHOULD use mpireconfig...
 456  Savevar=$PREFIX
 457  PREFIX=$APREFIX
 458 -#FixupFile installtest/makefile.proto $PREFIX/examples/Makefile
 459 -(cd $PREFIX/examples ; $PREFIX/lib/$ARCH/$COMM/mpireconfig Makefile )
 460 -echo "(cd $PREFIX/examples ; $MAKE clean)" >> $UNINSTALLFILE
 461 -echo "/bin/rm -f $PREFIX/examples/Makefile" >> $UNINSTALLFILE
 462 +#FixupFile installtest/makefile.proto $PREFIX/wshare/examples/mpi/Makefile
 463 +(cd $PREFIX/share/examples/mpi ; $PREFIX/libdata/$ARCH/$COMM/mpireconfig Makefile )
 464 +echo "(cd $PREFIX/share/examples/mpi ; $MAKE clean)" >> $UNINSTALLFILE
 465 +echo "/bin/rm -f $PREFIX/share/examples/mpi/Makefile" >> $UNINSTALLFILE
 466  PREFIX=$Savevar
 467 -CopyFile $PREFIX/examples/Makefile $PREFIX/lib/$ARCH/$COMM/Makefile.sample
 468 -CopyFile installtest/cpi.c $PREFIX/examples
 469 -CopyFile installtest/pi3.f $PREFIX/examples
 470 -CopyFile installtest/cpilog.c $PREFIX/examples
 471 -CopyFile installtest/hello++.cc $PREFIX/examples
 472 +CopyFile $PREFIX/share/examples/mpi/Makefile $PREFIX/libdata/$ARCH/$COMM/Makefile.sample
 473 +CopyFile installtest/cpi.c $PREFIX/share/examples/mpi
 474 +CopyFile installtest/pi3.f $PREFIX/share/examples/mpi
 475 +CopyFile installtest/cpilog.c $PREFIX/share/examples/mpi
 476 +CopyFile installtest/hello++.cc $PREFIX/share/examples/mpi
 477  if [ -s romio/test/simple.c ] ; then
 478 -    CopyFile romio/test/simple.c $PREFIX/examples/simpleio.c
 479 +    CopyFile romio/test/simple.c $PREFIX/share/examples/mpi/simpleio.c
 480  fi
 481 -CopyFile installtest/README $PREFIX/examples
 482 +CopyFile installtest/README $PREFIX/share/examples/mpi
 483  #
 484  # Test build the examples
 485 -$Show "(cd $PREFIX/examples ; /bin/rm -f mpirun ; \
 486 +$Show "(cd $PREFIX/share/examples/mpi ; /bin/rm -f mpirun ; \
 487           ln -s ../bin/mpirun mpirun )"
 488 -echo "/bin/rm -f $PREFIX/examples/mpirun" >> $UNINSTALLFILE
 489 +echo "/bin/rm -f $PREFIX/share/examples/mpi/mpirun" >> $UNINSTALLFILE
 490  #
 491 -echo "About to run installation test..."
 492 -$Show "(cd $PREFIX/examples; $MAKE all )"
 493 +#echo "About to run installation test..."
 494 +#$Show "(cd $PREFIX/share/examples/mpi; $MAKE all )"
 495  #
 496  # This SHOULD use mpireconfig...
 497  Savevar=$PREFIX
 498  if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then
 499      # C++ Example programs
 500 -    CopyFile installtest/mpi-2-c++/Makefile.in $PREFIX/$CPP_DIR/examples
 501 +    CopyFile installtest/mpi-2-c++/Makefile.in $PREFIX/share/examples/$CPP_DIR
 502      #
 503      PREFIX=$APREFIX
 504 -    (cd $PREFIX/$CPP_DIR/examples ; $PREFIX/lib/$ARCH/$COMM/mpireconfig Makefile )
 505 -    echo "(cd $PREFIX/$CPP_DIR/examples ; $MAKE clean)" >> $UNINSTALLFILE
 506 -    echo "/bin/rm -f $PREFIX/$CPP_DIR/examples/Makefile" >> $UNINSTALLFILE
 507 +    (cd $PREFIX/share/examples/$CPP_DIR ; $PREFIX/libdata/$ARCH/$COMM/mpireconfig Makefile )
 508 +    echo "(cd $PREFIX/share/examples/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE
 509 +    echo "/bin/rm -f $PREFIX/share/examples/$CPP_DIR/Makefile" >> $UNINSTALLFILE
 510      PREFIX=$Savevar
 511 -    CopyFile $CPP_DIR/contrib/examples/hello_world.cc $PREFIX/$CPP_DIR/examples
 512 -    CopyFile $CPP_DIR/contrib/examples/ring.cc $PREFIX/$CPP_DIR/examples
 513 -    CopyFile $CPP_DIR/contrib/examples/topology.cc $PREFIX/$CPP_DIR/examples
 514 -    CopyFile $CPP_DIR/contrib/examples/user_bcast.cc $PREFIX/$CPP_DIR/examples
 515 -    CopyFile $CPP_DIR/contrib/examples/chapter_10_mpi2.cc $PREFIX/$CPP_DIR/examples
 516 -    CopyFile $CPP_DIR/contrib/examples/pi.cc $PREFIX/$CPP_DIR/examples
 517 -    CopyFile $CPP_DIR/contrib/examples/README $PREFIX/$CPP_DIR/examples
 518 +    CopyFile $CPP_DIR/contrib/examples/hello_world.cc $PREFIX/share/examples/$CPP_DIR
 519 +    CopyFile $CPP_DIR/contrib/examples/ring.cc $PREFIX/share/examples/$CPP_DIR
 520 +    CopyFile $CPP_DIR/contrib/examples/topology.cc $PREFIX/share/examples/$CPP_DIR
 521 +    CopyFile $CPP_DIR/contrib/examples/user_bcast.cc $PREFIX/share/examples/$CPP_DIR
 522 +    CopyFile $CPP_DIR/contrib/examples/chapter_10_mpi2.cc $PREFIX/share/examples/$CPP_DIR
 523 +    CopyFile $CPP_DIR/contrib/examples/pi.cc $PREFIX/share/examples/$CPP_DIR
 524 +    CopyFile $CPP_DIR/contrib/examples/README $PREFIX/share/examples/$CPP_DIR
 525      #
 526      # Test build the C++ examples
 527 -    $Show "(cd $PREFIX/$CPP_DIR/examples ; /bin/rm -f mpirun ; \
 528 +    $Show "(cd $PREFIX/share/examples/$CPP_DIR ; /bin/rm -f mpirun ; \
 529               ln -s ../../bin/mpirun mpirun )"
 530 -    echo "/bin/rm -f $PREFIX/$CPP_DIR/examples/mpirun" >> $UNINSTALLFILE
 531 +    echo "/bin/rm -f $PREFIX/share/examples/$CPP_DIR/mpirun" >> $UNINSTALLFILE
 532      #
 533 -    echo "About to run C++ installation test..."
 534 -    $Show "(cd $PREFIX/$CPP_DIR/examples; $MAKE)"
 535 +    #echo "About to run C++ installation test..."
 536 +    #$Show "(cd $PREFIX/share/examples/$CPP_DIR; $MAKE)"
 537      #
 538  fi
 539  #