--- a/jaxp/make/Makefile	Thu May 14 10:58:01 2009 -0700
+++ b/jaxp/make/Makefile	Fri May 15 13:24:02 2009 -0700
@@ -69,6 +69,10 @@
   endif
 endif
 
+ifeq ($(DEBUG_CLASSFILES), true)
+  ANT_OPTIONS += -Djavac.debug=true
+endif
+
 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
 # and the somewhat misnamed CLASS_VERSION (-target NN)
 ifdef TARGET_CLASS_VERSION

--- a/jaxp/make/build.properties	Thu May 14 10:58:01 2009 -0700
+++ b/jaxp/make/build.properties	Fri May 15 13:24:02 2009 -0700
@@ -32,7 +32,6 @@
 # options for the <javac> tasks used to compile the tools
 javac.target = 5
 javac.debug = true
-javac.debuglevel = source,lines
 javac.no.jdk.warnings = -XDignore.symbol.file=true
 # set the following to -version to verify the versions of javac being used
 javac.version.opt = 

--- a/jaxp/make/build.xml	Thu May 14 10:58:01 2009 -0700
+++ b/jaxp/make/build.xml	Fri May 15 13:24:02 2009 -0700
@@ -85,6 +85,7 @@
              destdir="${build.classes.dir}"
              memoryInitialSize="${javac.memoryInitialSize}"
              memoryMaximumSize="${javac.memoryMaximumSize}"
+	     debug="${javac.debug}"
              target="${javac.target}">
          <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
          <compilerarg line="${javac.version.opt}"/>