[Tinyos-2-commits] CVS: tinyos-2.x/tools/tinyos/misc tos-locate-jre, 1.2, 1.3

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15336

Modified Files:
	tos-locate-jre 
Log Message:
Incorporate fix for Gentoo from Daniel Goertzen.


Index: tos-locate-jre
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc/tos-locate-jre,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tos-locate-jre	12 Jul 2006 17:00:50 -0000	1.2
--- tos-locate-jre	9 Jan 2007 20:49:25 -0000	1.3
***************
*** 51,57 ****
  
      Linux)
      # We check the path first, on the assumption that that's the preferred
      # version.
!     pathlocate javac || { test -z "$javac" && pathlocate java; }
      if [ -z "$javapath" ]; then
  	# We try a bunch of standard names, before resorting to rpm -qa
--- 51,61 ----
  
      Linux)
+     # Check gentoo java configuration
+     javapath=`java-config -c 2>/dev/null`
      # We check the path first, on the assumption that that's the preferred
      # version.
!     if [ -z "$javapath" ]; then
!         pathlocate javac || { test -z "$javac" && pathlocate java; }
!     fi
      if [ -z "$javapath" ]; then
  	# We try a bunch of standard names, before resorting to rpm -qa