--- setclasspath.sh.orig	2006-04-18 01:10:06.000000000 -0700
+++ setclasspath.sh.orig	2006-04-18 01:11:21.000000000 -0700
@@ -70,6 +70,9 @@ 
 # Set standard CLASSPATH
 if [ "$1" = "debug" -o "$1" = "javac" ] ; then
   CLASSPATH="$JAVA_HOME"/lib/tools.jar
+  if [ "$1" = "javac" ] ; then
+    shift
+  fi
 fi
 
 # OSX hack to CLASSPATH