[openrtm-commit:01920] r620 - tags/RELEASE_1_1_2/rtmtools

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-04-26 17:02:47 +0900 (Tue, 26 Apr 2016)
New Revision: 620

Modified:
   tags/RELEASE_1_1_2/rtmtools/
   tags/RELEASE_1_1_2/rtmtools/openrtp
Log:
r619 has been merged from trunk.


Property changes on: tags/RELEASE_1_1_2/rtmtools
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/work_kawauchi/rtmtools:518-526
/trunk/rtmtools:617
   + /branches/work_kawauchi/rtmtools:518-526
/trunk/rtmtools:617,619

Modified: tags/RELEASE_1_1_2/rtmtools/openrtp
===================================================================
--- tags/RELEASE_1_1_2/rtmtools/openrtp	2016-04-26 03:00:44 UTC (rev 619)
+++ tags/RELEASE_1_1_2/rtmtools/openrtp	2016-04-26 08:02:47 UTC (rev 620)
@@ -15,6 +15,8 @@
 #
 
 
+cd $(cd $(dirname $(readlink -f $0 || echo $0));pwd -P)
+
 debug_echo () {
     if test "x$DEBUG" = "xTRUE"; then
         echo "$*"
@@ -275,8 +277,16 @@
             echo "WARNING: No OpenRTP installation under OpenRTM libdir."
         fi
     fi
-    openrtp_dir=`find /usr/lib /usr/lib32 /usr/lib64 -name 'openrtp'  2>/dev/null`
-    if test "x$openrtp_dir" = "x" ; then
+    openrtp_dir=`find /usr/lib /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib32 /usr/lib64 -name 'openrtp'  2>/dev/null`
+    eclipse_dir=`find ./ -name 'eclipse'  2>/dev/null`
+
+    if test "x$eclipse_dir" != "x" ; then
+        OPENRTP_DIR="./"
+        OPENRTP_EXECUTABLE="./eclipse"
+        debug_echo "OPENRTP_DIR: $OPENRTP_DIR"
+        debug_echo "OPENRTP_EXECUTABLE: $OPENRTP_EXECUTABLE"
+        return 0
+    elif test "x$openrtp_dir" = "x" ; then
         echo "ERROR: No OpenRTP installation found. Aborting."
         exit 1
     fi