From 36a48508667b24317d2c64cc261d6c03141111c4 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 8 Dec 2012 21:38:04 +0000
Subject: look in
 /opt/jdk1.6.0_22/bin:/usr/lib/jvm/java-6-sun//bin:.:/home/grothoff/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
 for gnunet-arm before trying /proc/exe

---
 src/util/os_installation.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/util/os_installation.c')

diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 674e47a5f..e35f86c3e 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -396,6 +396,9 @@ os_get_gnunet_path ()
 #if LINUX
   if (NULL != (ret = get_path_from_proc_maps ()))
     return ret;
+  /* try path *first*, before /proc/exe, as /proc/exe can be wrong */
+  if (NULL != (ret = get_path_from_PATH ("gnunet-arm")))
+    return ret;
   if (NULL != (ret = get_path_from_proc_exe ()))
     return ret;
 #endif
-- 
cgit v1.2.3