[mpich2-commits] r4071 - mpich2/trunk/src/pm/hydra/pm/central

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-03-14 17:26:02 -0500 (Sat, 14 Mar 2009)
New Revision: 4071

Modified:
   mpich2/trunk/src/pm/hydra/pm/central/Makefile.sm
   mpich2/trunk/src/pm/hydra/pm/central/central_launch.c
Log:
Changed the proxy to be called hydproxy to make it less generic.

Modified: mpich2/trunk/src/pm/hydra/pm/central/Makefile.sm
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/central/Makefile.sm	2009-03-14 21:50:34 UTC (rev 4070)
+++ mpich2/trunk/src/pm/hydra/pm/central/Makefile.sm	2009-03-14 22:26:02 UTC (rev 4071)
@@ -4,9 +4,7 @@
 #     See COPYRIGHT in top-level directory.
 #
 
-HYDRA_LIB_PATH = ../../lib
-
-libhydra_a_DIR = ${HYDRA_LIB_PATH}
+libhydra_a_DIR = ../../lib
 libhydra_a_SOURCES = central_launch.c central_finalize.c central_cb.c
 INCLUDES = -I${abs_srcdir}/../../include \
 	-I${abs_srcdir}/../../../../include \
@@ -18,10 +16,10 @@
 	-I${abs_srcdir}/../../bootstrap/include \
 	-I${abs_srcdir}/../../demux
 
-proxy_SOURCES = proxy.c proxy_utils.c proxy_cb.c
-proxy_LDADD = -L../../lib -lhydra -L../../../util -lmpiexec -L../../../../../lib -lmpich
-proxy_DEPADD = ../../../util/libmpiexec.a
-install_BIN = proxy
+hydproxy_SOURCES = proxy.c proxy_utils.c proxy_cb.c
+hydproxy_LDADD = -L../../lib -lhydra -L../../../util -lmpiexec -L../../../../../lib -lmpich
+hydproxy_DEPADD = ../../../util/libmpiexec.a
+install_BIN = hydproxy
 
 # Use the mpich2-build-install target to include mpiexec in the build bin
 # directory (all pm's require these targets)

Modified: mpich2/trunk/src/pm/hydra/pm/central/central_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/central/central_launch.c	2009-03-14 21:50:34 UTC (rev 4070)
+++ mpich2/trunk/src/pm/hydra/pm/central/central_launch.c	2009-03-14 22:26:02 UTC (rev 4071)
@@ -135,7 +135,7 @@
                 path_str[i++] = MPIU_Strdup("/");
             }
             path_str[i++] = MPIU_Strdup(handle.base_path);
-            path_str[i++] = MPIU_Strdup("proxy");
+            path_str[i++] = MPIU_Strdup("hydproxy");
             path_str[i] = NULL;
             status = HYDU_String_alloc_and_join(path_str, &partition->args[arg]);
             if (status != HYD_SUCCESS) {