Added forced check for amd64 directory when performing a tos-locate-jre

[tinyos-2.x.git] / tools / tinyos / misc / tos-locate-jre

diff --git a/tools/tinyos/misc/tos-locate-jre b/tools/tinyos/misc/tos-locate-jre
index 8820ee34ebaf327596c5bb8dbabadd93276b401b..4f93dd7945e3a886b459460fd9ab8d07f06bb694 100755 (executable)
--- a/tools/tinyos/misc/tos-locate-jre
+++ b/tools/tinyos/misc/tos-locate-jre
@@ -38,11 +38,11 @@ pathlocate () {
 case `uname` in
     CYGWIN*)
     # Hopefully this will always work on cygwin with Sun's Java
-    jversion=`regtool -q get '\HKLM\SOFTWARE\JavaSoft\Java Development Kit\CurrentVersion'`
+    jversion=`regtool -q get '\\HKLM\\SOFTWARE\\JavaSoft\\Java Development Kit\\CurrentVersion'`
     if [ $? != 0 ]; then
        exit 1
     fi
-    jhome=`regtool -q get '\HKLM\SOFTWARE\JavaSoft\Java Development Kit\'$jversion'\JavaHome'`
+    jhome=`regtool -q get '\\HKLM\SOFTWARE\\JavaSoft\\Java Development Kit\\'$jversion'\\JavaHome'`
     if [ $? != 0 ]; then
        exit 1
     fi
@@ -121,8 +121,10 @@ if [ "$jni" = "yes" ]; then
        arch=`uname -m`
        jnilocate "$jhome/jre/lib/$arch" || \
            jnilocate "$jhome/jre/lib/i386" || \
+           jnilocate "$jhome/jre/lib/amd64" || \
            jnilocate "$jhome/lib/$arch" || \
-           jnilocate "$jhome/lib/i386"
+           jnilocate "$jhome/lib/i386" || \
+           jnilocate "$jhome/lib/amd64"
     fi
 elif [ "$javac" = "yes" ]; then
  if [ `uname` = "Darwin" ]; then