installing all service, daemon and helper binaries to lib/gnunet/libexec/; updating code to run binaries from new location, which is no longer in PATH

2 files changed, 32 insertions, 2 deletions

diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 76aec40b6..f91e4210f 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -2,6 +2,8 @@ INCLUDES = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 pkgcfg_DATA = \
   arm.conf
 
@@ -27,7 +29,9 @@ libgnunetarm_la_LDFLAGS = \
 
 
 bin_PROGRAMS = \
- gnunet-arm \
+ gnunet-arm 
+
+libexec_PROGRAMS = \
  gnunet-service-arm \
  mockup-service 
 
diff --git a/src/arm/do_start_process.c b/src/arm/do_start_process.c
index 1bc56d540..0687fa345 100644
--- a/src/arm/do_start_process.c
+++ b/src/arm/do_start_process.c
@@ -1,3 +1,23 @@
+/*
+     This file is part of GNUnet.
+     (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
 /**
  * Actually start a process.  All of the arguments given to this
  * function are strings that are used for the "argv" array.  However,
@@ -27,6 +47,7 @@ do_start_process (int pipe_control, unsigned int std_inheritance,
   char *cp;
   const char *last;
   struct GNUNET_OS_Process *proc;
+  char *binary_path;
 
   argv_size = 1;
   va_start (ap, first_arg);
@@ -98,9 +119,14 @@ do_start_process (int pipe_control, unsigned int std_inheritance,
 /* *INDENT-ON* */
   va_end (ap);
   argv[argv_size] = NULL;
-  proc = GNUNET_OS_start_process_v (pipe_control, std_inheritance, lsocks, argv[0], argv);
+  binary_path = GNUNET_OS_get_libexec_binary_path (argv[0]);
+  proc = GNUNET_OS_start_process_v (pipe_control, std_inheritance, lsocks, 
+                                    binary_path, argv);
   while (argv_size > 0)
     GNUNET_free (argv[--argv_size]);
   GNUNET_free (argv);
+  GNUNET_free (binary_path);
   return proc;
 }
+
+/* end of do_start_process.c */