[mpich2-commits] r5471 - in mpich2/trunk/src/mpe2: sbin src/slog2sdk/trace_rlog/sbin src/slog2sdk/trace_sample/sbin

[chan at mcs.anl.gov]

Author: chan
Date: 2009-10-15 18:50:22 -0500 (Thu, 15 Oct 2009)
New Revision: 5471

Modified:
   mpich2/trunk/src/mpe2/sbin/mpeinstall.in
   mpich2/trunk/src/mpe2/src/slog2sdk/trace_rlog/sbin/install-package.in
   mpich2/trunk/src/mpe2/src/slog2sdk/trace_sample/sbin/install-package.in
Log:
remove r5470. Added better support to avoid installing all *.in that includes mpecc.in,mpefc.in,traceTOslog2.in and Makefile.in.



Modified: mpich2/trunk/src/mpe2/sbin/mpeinstall.in
===================================================================
--- mpich2/trunk/src/mpe2/sbin/mpeinstall.in	2009-10-15 22:42:06 UTC (rev 5470)
+++ mpich2/trunk/src/mpe2/sbin/mpeinstall.in	2009-10-15 23:50:22 UTC (rev 5471)
@@ -248,10 +248,17 @@
         # & set it as the original PWD before "cd $1"
         set $1 $2 ${3:-"$MODE"} `pwd`
         cd $1
+        # Install everything but *.in file(that includes mpecc.in/Makefile.in)
         for file in * ; do
-            if [ -f $file ] ; then
-                InstallFile $file $2/$file $3
-            fi
+            case "$file" in
+                *.in)
+                    ;;
+                *)
+                    if [ -f $file ] ; then
+                        InstallFile $file $2/$file $3
+                    fi
+                    ;;
+            esac
         done
         for dir in * ; do
             if [ -d $dir \
@@ -477,18 +484,7 @@
 if [ -n "$binbuild_dir" ] ; then
     if [ -d $binbuild_dir ] ; then
         echo "Installing $pkgname utility programs to $DESTDIR$bindir"
-        # InstallDirRecur $binbuild_dir $bindir $XMODE
-        MkDir $bindir
-        cd $binbuild_dir
-        for file in * ; do
-            case "$file" in 
-                *.in)
-                    ;;
-                *)
-                    InstallFile $binbuild_dir/$file $bindir/$file $XMODE
-                    ;;
-            esac
-        done
+        InstallDirRecur $binbuild_dir $bindir $XMODE
         if [ -s $binbuild_dir/mpecc -a -x $binbuild_dir/mpecc ] ; then
             FixInstallFile $binbuild_dir/mpecc $bindir/mpecc $XMODE
         fi

Modified: mpich2/trunk/src/mpe2/src/slog2sdk/trace_rlog/sbin/install-package.in
===================================================================
--- mpich2/trunk/src/mpe2/src/slog2sdk/trace_rlog/sbin/install-package.in	2009-10-15 22:42:06 UTC (rev 5470)
+++ mpich2/trunk/src/mpe2/src/slog2sdk/trace_rlog/sbin/install-package.in	2009-10-15 23:50:22 UTC (rev 5471)
@@ -219,10 +219,17 @@
         # & set it as the original PWD before "cd $1"
         set $1 $2 ${3:-"$MODE"} `pwd`
         cd $1
+        # Install everything but *.in file(that includes mpecc.in/Makefile.in)
         for file in * ; do
-            if [ -f $file ] ; then
-                InstallFile $file $2/$file $3
-            fi
+            case "$file" in
+                *.in)
+                    ;;
+                *)
+                    if [ -f $file ] ; then
+                        InstallFile $file $2/$file $3
+                    fi
+                    ;;
+            esac
         done
         for dir in * ; do
             if [ -d $dir \

Modified: mpich2/trunk/src/mpe2/src/slog2sdk/trace_sample/sbin/install-package.in
===================================================================
--- mpich2/trunk/src/mpe2/src/slog2sdk/trace_sample/sbin/install-package.in	2009-10-15 22:42:06 UTC (rev 5470)
+++ mpich2/trunk/src/mpe2/src/slog2sdk/trace_sample/sbin/install-package.in	2009-10-15 23:50:22 UTC (rev 5471)
@@ -219,10 +219,17 @@
         # & set it as the original PWD before "cd $1"
         set $1 $2 ${3:-"$MODE"} `pwd`
         cd $1
+        # Install everything but *.in file(that includes mpecc.in/Makefile.in)
         for file in * ; do
-            if [ -f $file ] ; then
-                InstallFile $file $2/$file $3
-            fi
+            case "$file" in
+                *.in)
+                    ;;
+                *)
+                    if [ -f $file ] ; then
+                        InstallFile $file $2/$file $3
+                    fi
+                    ;;
+            esac
         done
         for dir in * ; do
             if [ -d $dir \