--- processing/build/linux/make.sh	2005-04-17 00:17:20.000000000 +0200
+++ processing-nextlab/build/linux/make.sh	2005-07-09 13:11:54.000000000 +0200
@@ -1,6 +1,22 @@
 #!/bin/sh
 
 
+### -- SETUP TOOLS ----------------------------------------------
+
+JIKES=`which jikes 2> /dev/null`
+echo "Found jikes: $JIKES";
+if [ "x$JIKES" == "x" ]; then
+    JIKES=../build/linux/work/jikes
+fi
+echo "Using jikes: $JIKES";
+
+JAVA=`which java 2> /dev/null`
+if [ "x$JAVA" == "x" ]; then
+    JAVA=../../build/linux/work/java/bin/java
+fi
+echo "Using java: $JAVA";
+
+
 ### -- SETUP WORK DIR -------------------------------------------
 
 if test -d work
@@ -68,7 +84,7 @@
 export CLASSPATH
 
 perl preproc.pl
-../build/linux/work/jikes -d . +D -target 1.1 *.java
+$JIKES -d . +D -target 1.1 *.java
 zip -rq ../build/linux/work/lib/core.jar processing
 rm -rf processing
 
@@ -86,12 +102,10 @@
 # first build the default java goop
 # long path is to avoid requiring java to be in your PATH
 
-../../build/linux/work/java/bin/java \
-  -cp ../../build/linux/work/lib/antlr.jar antlr.Tool java.g
+$JAVA -cp ../../build/linux/work/lib/antlr.jar antlr.Tool java.g
 
 # now build the pde stuff that extends the java classes
-../../build/linux/work/java/bin/java \
-  -cp ../../build/linux/work/lib/antlr.jar antlr.Tool -glib java.g pde.g
+$JAVA -cp ../../build/linux/work/lib/antlr.jar antlr.Tool -glib java.g pde.g
 
 cd ../..
 
@@ -102,7 +116,7 @@
 
 CLASSPATH="../build/linux/work/lib/core.jar:../build/linux/work/lib/mrj.jar:../build/linux/work/lib/antlr.jar:../build/linux/work/lib/oro.jar:../build/linux/work/lib/registry.jar:../build/linux/work/java/lib/rt.jar"
 
-../build/linux/work/jikes -target 1.3 +D -classpath $CLASSPATH:../build/linux/work/classes -d ../build/linux/work/classes *.java preproc/*.java syntax/*.java tools/*.java
+$JIKES -target 1.3 +D -classpath $CLASSPATH:../build/linux/work/classes -d ../build/linux/work/classes *.java preproc/*.java syntax/*.java tools/*.java
 
 cd ../build/linux/work/classes
 rm -f ../lib/pde.jar
@@ -118,7 +132,6 @@
 
 #CLASSPATH="../../build/linux/work/lib/core.jar:../../build/linux/work/java/lib/rt.jar"
 CLASSPATH=../build/$PLATFORM/work/lib/core.jar:$CLASSPATH
-JIKES=../build/$PLATFORM/work/jikes
 CORE=../build/$PLATFORM/work/lib/core.jar
 LIBRARIES=../build/$PLATFORM/work/libraries