From 715d866da6642bfb054a42b7ba30204f3d8f7fc4 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Tue, 5 Jan 2010 15:11:41 +0000
Subject: [PATCH] Minor fixes:  * Fix typo in echo message  * Only traverse
 into orte/ and ompi/ if they exist (i.e., properly    handle --no-orte and
 --no-ompi tarballs).  Note that this was only    a minor error -- before,
 they just output error messages and    (correctly) kept going.  This fix just
 removes the error messages.

This commit was SVN r22353.
---
 config/distscript.csh | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/config/distscript.csh b/config/distscript.csh
index 742756664e..1edf1a1f61 100755
--- a/config/distscript.csh
+++ b/config/distscript.csh
@@ -74,16 +74,23 @@ if ("$cur_svn_r" == "-1") then
     touch -r "${srcdir}/VERSION" "${distdir}/VERSION"
     echo "*** Updated VERSION file with SVN r number"
 else
-    echo "*** Did NOT updated VERSION file with SVN r number"
+    echo "*** Did NOT update VERSION file with SVN r number"
 endif
 
 # Copy configure.params and autogen.subdirs files into distribution.
 # This should really be in each component's Makefile.am, but that's
 # never going to happen.  So copy here automagically.
 echo "*** Copying configure.params files"
-find opal orte ompi -name "configure.params" -exec cp -f -p "{}" "$distdir/{}" \; >& /dev/null
+set dirs=opal
+if (-d orte) then
+    set dirs="$dirs orte"
+endif
+if (-d ompi) then
+    set dirs="$dirs ompi"
+endif
+find $dirs -name "configure.params" -exec cp -f -p "{}" "$distdir/{}" \; >& /dev/null
 echo "*** Copying autogen.subdirs files"
-find opal orte ompi -name "autogen.subdirs" -exec cp -f -p "{}" "$distdir/{}" \; >& /dev/null
+find $dirs -name "autogen.subdirs" -exec cp -f -p "{}" "$distdir/{}" \; >& /dev/null
 
 #########################################################
 # VERY IMPORTANT: Now go into the new distribution tree #
@@ -157,10 +164,12 @@ echo "*** Now in: `pwd`"
 echo "*** Replacing config.sub/config.guess with latest from ftp.gnu.org..."
 foreach file (config.guess config.sub)
     foreach dir (opal orte ompi)
-        find $dir -name $file \
-            -exec chmod +w {} \; \
-            -exec cp -f $configdir/$file {} \; \
-            -print
+        if (-d $dir) then
+            find $dir -name $file \
+                -exec chmod +w {} \; \
+                -exec cp -f $configdir/$file {} \; \
+                -print
+        endif
     end
 end