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

@@ -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 \

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;