$NetBSD: patch-al,v 1.8 2006/05/16 22:01:19 joerg Exp $

--- util/mpiinstall.in.orig	2004-07-02 17:34:43.000000000 +0000
+++ util/mpiinstall.in
@@ -172,7 +172,7 @@ if [ "$prefix_override" = 1 ] ; then
     bindir=$prefix/bin
     sbindir=$prefix/sbin
     includedir=$prefix/include
-    sysconfdir=$prefix/etc
+    sysconfdir=$prefix/mpi-ch/etc
     libdir=$prefix/lib
     sharedlib_dir=$libdir/shared
     messagecat_dir=$libdir
@@ -451,11 +451,13 @@ MkDir $sbindir
 MkDir $includedir
 MkDir $datadir
 MkDir $docdir
-MkDir $sysconfdir
+#MkDir $sysconfdir
 
-MkDir $prefix/examples
+MkDir $prefix/share/util
+MkDir $prefix/share/util/machines
+MkDir $prefix/share/examples/mpi-ch
 if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
-    MkDir $prefix/examples/$CPP_DIR
+    MkDir $prefix/share/examples/mpi-ch/$CPP_DIR
     MkDir $includedir/mpi2c++
 fi
 
@@ -478,14 +480,14 @@ chmod +x $UNINSTALLFILE
 if [ -z "$libonly" ] ; then
     CopyFile ${top_srcdir}/bin/tarch $bindir $XMODE
     CopyFile ${top_srcdir}/bin/tdevice $bindir $XMODE
-    CopyFile util/mpichlib.conf ${sysconfdir} 
+    CopyFile util/mpichlib.conf ${prefix}/share/examples/mpi-ch
     if [ -x "bin/mpichversion.exe" ] ; then
         CopyFile bin/mpichversion.exe $bindir $XMODE
     else 
         CopyFile bin/mpichversion $bindir $XMODE
     fi
     # Copy the source file for mpichversion to the sysconfdir
-    CopyFile ${top_srcdir}/util/mpichversion.c ${sysconfdir}
+    CopyFile ${top_srcdir}/util/mpichversion.c ${prefix}/share/examples/mpi-ch
     #
     # mpiman
     $Show /bin/rm -f $DESTDIR$bindir/mpiman
@@ -566,12 +568,12 @@ if [ -z "$libonly" ] ; then
     FixupFile2 bin/mpicc $bindir/mpicc $XMODE
     if [ -x src/fortran/src/mpif77 -a "@NOF77@" = "0" ] ; then
         CopyFile src/fortran/src/mpif77 $bindir/mpif77 $XMODE
-        CopyFile src/fortran/src/mpif77.conf $sysconfdir
+        CopyFile src/fortran/src/mpif77.conf ${prefix}/share/examples/mpi-ch
         CopyFile $includebuild_dir/mpif.h $includedir
     fi
     if [ -x src/fortran/src/mpif90 -a "@NO_F90@" = "0" ] ; then
         CopyFile src/fortran/src/mpif90 $bindir/mpif90 $XMODE
-	CopyFile src/fortran/src/mpif90.conf $sysconfdir
+	CopyFile src/fortran/src/mpif90.conf ${prefix}/share/examples/mpi-ch
     fi
     #
     # mpiCC, if C++ selected
@@ -623,23 +625,23 @@ else
     else 
         CopyFile bin/mpichversion $bindir $XMODE
     fi
-    CopyFile util/mpichlib.conf ${sysconfdir}
+    CopyFile util/mpichlib.conf ${prefix}/share/examples/mpi-ch
     # Copy the source file for mpichversion to the sysconfdir
-    CopyFile $top_srcdir/util/mpichversion.c ${sysconfdir}
+    CopyFile $top_srcdir/util/mpichversion.c ${prefix}/share/examples/mpi-ch
     FixupFile $top_srcdir/util/mpireconfig.in $bindir/mpireconfig $XMODE
     # No user include uses mpichconf.h
-    CopyFile $includebuild_dir/mpichconf.h $sysconfdir/mpichconf.h.dat
+    CopyFile $includebuild_dir/mpichconf.h ${prefix}/share/examples/mpi-ch/mpichconf.h.dat
     CopyFile $includebuild_dir/mpidefs.h $includedir 
     CopyFile $includebuild_dir/mpi.h $includedir
     if [ -s $includebuild_dir/mpif.h -a "@NOF77@" = "0" ] ; then
         CopyFile $includebuild_dir/mpi_fortdefs.h $includedir
         CopyFile src/fortran/src/mpif77 $bindir/mpif77 $XMODE
-	CopyFile src/fortran/src/mpif77.conf $sysconfdir
+	CopyFile src/fortran/src/mpif77.conf ${prefix}/share/examples/mpi-ch
         CopyFile $includebuild_dir/mpif.h $includedir
     fi
     if [ -x src/fortran/src/mpif90 -a "@NO_F90@" = "0" ] ; then
         CopyFile src/fortran/src/mpif90 $bindir/mpif90 $XMODE
-	CopyFile src/fortran/src/mpif90.conf $sysconfdir
+	CopyFile src/fortran/src/mpif90.conf ${prefix}/share/examples/mpi-ch
     fi
     if [ -s romio/include/mpio.h ] ; then
         CopyFile romio/include/mpio.h $includedir
@@ -697,7 +699,7 @@ if [ -z "$libonly" ] ; then
     #	$CPRP -r util/machines $prefix/util/machines.anl
     for file in util/machines/machines* ; do
         if [ -s $file ] ; then 
-            CopyFile $file $datadir
+            CopyFile $file $prefix/share/util/machines
 	fi
     done
     #
@@ -710,7 +712,7 @@ if [ -z "$libonly" ] ; then
     #CopyFile include/protofix.h $includedir
     #CopyFile include/patchlevel.h $includedir
     # No user include uses mpichconf.h
-    CopyFile $includebuild_dir/mpichconf.h $sysconfdir/mpichconf.h.dat
+    CopyFile $includebuild_dir/mpichconf.h ${prefix}/share/examples/mpi-ch/mpichconf.h.dat
     CopyFile $includebuild_dir/mpidefs.h $includedir
     # Install ROMIO files
     if [ -s romio/include/mpio.h ] ; then
@@ -994,6 +996,8 @@ fi
 CopyFile $top_srcdir/util/cleanipcs $sbindir $XMODE
 #
 # Example programs
+# We install all example programs, so we can skip these
+if [ ! true ]; then
 CopyFile $top_srcdir/installtest/Makefile.in $prefix/examples
 #
 # This SHOULD use mpireconfig...
@@ -1027,14 +1031,16 @@ CopyFile $top_srcdir/installtest/README 
 $Show "(cd $DESTDIR$prefix/examples ; /bin/rm -f mpirun ; \
 	  ln -s ../bin/mpirun mpirun )"
 echo "/bin/rm -f $prefix/examples/mpirun" >> $UNINSTALLFILE
+
+fi # no examples
 #
 echo "About to run installation test..."
 if [ "x$DESTDIR" = "x" ]; then
   # only works when DESTDIR is blank, and installing on final location.
-  $Show "(cd $DESTDIR$prefix/examples; $MAKE all ; $MAKE clean )"
+  $Show "(cd $prefix/share/examples/mpi-ch; $MAKE all ; $MAKE clean )"
   if [ @SHAREDKIND@ != "ignore" ] ; then
     echo "About to run installation test for shared libraries ..."
-    $Show "(cd $DESTDIR$prefix/examples; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
+    $Show "(cd $prefix/share/examples/mpi-ch; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
   fi
 fi
 #
@@ -1043,39 +1049,40 @@ Savevar=$prefix
 if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
 # Removed the installation of these extra examples.  
     # C++ Example programs 
-#    CopyFile $top_srcdir/installtest/mpi-2-c++/Makefile.in $prefix/examples/$CPP_DIR
+    CopyFile $top_srcdir/installtest/mpi-2-c++/Makefile.in $prefix/share/examples/mpi-ch/$CPP_DIR
     #
     prefix=$APREFIX
-#      CPPEXDIR=$top_srcdir/$CPP_DIR/contrib/examples
+      CPPEXDIR=$top_srcdir/$CPP_DIR/contrib/examples
 #      # This isn't correct because it doesn't handle all of the fields in
 #      # the C++ examples Makefile, particularly the TEMPLATE_REP field
 #      # The intent here is to update the directories; but we also need
 #      # to update a few additional fields
-#      (cd $prefix/examples/$CPP_DIR ; $bindir/mpireconfig Makefile )
-#      echo "(cd $prefix/examples/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE
-#      echo "/bin/rm -f $prefix/examples/$CPP_DIR/Makefile" >> $UNINSTALLFILE
-#      prefix=$Savevar
-#      CopyFile $CPPEXDIR/hello_world.cc $prefix/examples/$CPP_DIR
-#      CopyFile $CPPEXDIR/ring.cc $prefix/examples/$CPP_DIR
-#      CopyFile $CPPEXDIR/topology.cc $prefix/examples/$CPP_DIR
-#      CopyFile $CPPEXDIR/user_bcast.cc $prefix/examples/$CPP_DIR
-#      CopyFile $CPPEXDIR/chapter_10_mpi2.cc $prefix/examples/$CPP_DIR
-#      CopyFile $CPPEXDIR/pi.cc $prefix/examples/$CPP_DIR
-#      CopyFile $CPPEXDIR/README $prefix/examples/$CPP_DIR
+	(cd $prefix/share/examples/mpi-ch/$CPP_DIR ; $bindir/mpireconfig Makefile )
+	echo "(cd $prefix/share/examples/mpi-ch/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE
+	echo "/bin/rm -f $prefix/share/examples/mpi-ch/$CPP_DIR/Makefile" >> $UNINSTALLFILE
+      prefix=$Savevar
+    CopyFile $CPPEXDIR/hello_world.cc $prefix/share/examples/mpi-ch/$CPP_DIR
+    CopyFile $CPPEXDIR/ring.cc $prefix/share/examples/mpi-ch/$CPP_DIR
+    CopyFile $CPPEXDIR/topology.cc $prefix/share/examples/mpi-ch/$CPP_DIR
+    CopyFile $CPPEXDIR/user_bcast.cc $prefix/share/examples/mpi-ch/$CPP_DIR
+    CopyFile $CPPEXDIR/chapter_10_mpi2.cc $prefix/share/examples/mpi-ch/$CPP_DIR
+    CopyFile $CPPEXDIR/pi.cc $prefix/share/examples/mpi-ch/$CPP_DIR
+    CopyFile $CPPEXDIR/README $prefix/share/examples/mpi-ch/$CPP_DIR
+
 #      #
 #      # Test build the C++ examples
-#      $Show "(cd $prefix/examples/$CPP_DIR ; /bin/rm -f mpirun ; \
-#  	      ln -s ../../bin/mpirun mpirun )"
-#      echo "/bin/rm -f $prefix/examples/$CPP_DIR/mpirun" >> $UNINSTALLFILE
-#      #
-#      echo "About to run C++ installation test..."
-#      $Show "(cd $prefix/examples/$CPP_DIR; $MAKE ; $MAKE clean)"
+    $Show "(cd $prefix/share/examples/mpi-ch/$CPP_DIR ; /bin/rm -f mpirun ; \
+       ln -s $bindir/mpirun mpirun )"
+    echo "/bin/rm -f $prefix/share/examples/mpi-ch/$CPP_DIR/mpirun" >> $UNINSTALLFILE
+
+      echo "About to run C++ installation test..."
+      $Show "(cd $prefix/share/examples/mpi-ch/$CPP_DIR; $MAKE ; $MAKE clean)"
 #      # A temporary fix because C++ clean doesn't remove any template 
 #      # directories.  This will eventually need to be changed into a for loop
 #      # (even better, the clean target in the Makefile should be fixed)
-#      if [ -d $prefix/examples/$CPP_DIR/ii_files ] ; then
-#          $Show rm -rf $prefix/examples/$CPP_DIR/ii_files
-#      fi
+      if [ -d $prefix/share/examples/mpi-ch/$CPP_DIR/ii_files ] ; then
+          $Show rm -rf $prefix/share/examples/mpi-ch/$CPP_DIR/ii_files
+      fi
     #
 fi
 #