From 152bc14079974a628ee524d65fd728a3d2bec950 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Wed, 23 Sep 2009 20:28:49 +0000
Subject: [PATCH] Rename the help file to be consistent with others; add it to
 the Makefile.am.

This commit was SVN r22005.
---
 ompi/mca/coll/sm/Makefile.am                                | 3 +++
 ompi/mca/coll/sm/coll_sm_component.c                        | 4 ++--
 ompi/mca/coll/sm/{help-coll-sm.txt => help-mpi-coll-sm.txt} | 0
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename ompi/mca/coll/sm/{help-coll-sm.txt => help-mpi-coll-sm.txt} (100%)

diff --git a/ompi/mca/coll/sm/Makefile.am b/ompi/mca/coll/sm/Makefile.am
index 8dd945e5b6..aea7026ba3 100644
--- a/ompi/mca/coll/sm/Makefile.am
+++ b/ompi/mca/coll/sm/Makefile.am
@@ -9,6 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -18,6 +19,8 @@
 
 EXTRA_DIST = .windows
 
+dist_pkgdata_DATA = help-mpi-coll-sm.txt
+
 not_used_yet = \
         coll_sm_allgather.c \
         coll_sm_allgatherv.c \
diff --git a/ompi/mca/coll/sm/coll_sm_component.c b/ompi/mca/coll/sm/coll_sm_component.c
index dfc7ead0bc..f5c694ad3f 100644
--- a/ompi/mca/coll/sm/coll_sm_component.c
+++ b/ompi/mca/coll/sm/coll_sm_component.c
@@ -180,13 +180,13 @@ static int sm_register(void)
                            cs->sm_tree_degree,
                            &cs->sm_tree_degree);
     if (cs->sm_tree_degree > cs->sm_control_size) {
-        orte_show_help("help-coll-sm.txt", 
+        orte_show_help("help-mpi-coll-sm.txt", 
                        "tree-degree-larger-than-control", true,
                        cs->sm_tree_degree, cs->sm_control_size);
         cs->sm_tree_degree = cs->sm_control_size;
     }
     if (cs->sm_tree_degree > 255) {
-        orte_show_help("help-coll-sm.txt", 
+        orte_show_help("help-mpi-coll-sm.txt", 
                        "tree-degree-larger-than-255", true,
                        cs->sm_tree_degree);
         cs->sm_tree_degree = 255;
diff --git a/ompi/mca/coll/sm/help-coll-sm.txt b/ompi/mca/coll/sm/help-mpi-coll-sm.txt
similarity index 100%
rename from ompi/mca/coll/sm/help-coll-sm.txt
rename to ompi/mca/coll/sm/help-mpi-coll-sm.txt