--- old/jaxws/build.properties	2009-10-09 13:53:37.745156082 +0100
+++ new/jaxws/build.properties	2009-10-09 13:53:37.671594667 +0100
@@ -65,7 +65,7 @@
 dist.src.zip=${dist.lib.dir}/src.zip
 
 # Where all drop sources live
-drop.dir=./drop
+drop.dir=${output.dir}/drop
 
 # Where patches to drop bundle sources live
 patches.dir=patches
--- old/jaxws/jaxws.properties	2009-10-09 13:53:38.583731019 +0100
+++ new/jaxws/jaxws.properties	2009-10-09 13:53:38.513418621 +0100
@@ -23,7 +23,7 @@
 # have any questions.
 #
 
-drops.master.copy.base=${devtools}/share/jdk7-drops
+drops.master.copy.base=${dropdir}
 drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
 
 jaxws_src.bundle.name=jdk7-jaxws-2009_09_28.zip
--- old/jaxws/make/Makefile	2009-10-09 13:53:39.492192319 +0100
+++ new/jaxws/make/Makefile	2009-10-09 13:53:39.335308117 +0100
@@ -87,14 +87,18 @@
 endif
 
 # Where is /java/devtools in case we need it
-ifdef ALT_JDK_DEVTOOLS_DIR
-  _DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR)
+ifdef ALT_DROP_DIR
+  DROP_DIR = $(ALT_DROP_DIR)
 else
-  _DEVTOOLS = $(_SLASHJAVA)/devtools
+  ifdef ALT_JDK_DEVTOOLS_DIR
+    DROP_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
+  else
+    DROP_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
+  endif
 endif
 
 # Add in path to devtools
-ANT_OPTIONS += -Ddevtools=$(_DEVTOOLS)
+ANT_OPTIONS += -Ddropdir=$(DROP_DIR)
 
 ifdef ALT_OUTPUTDIR
   OUTPUTDIR = $(ALT_OUTPUTDIR)
--- old/jaxp/build.properties	2009-10-09 13:53:40.294651920 +0100
+++ new/jaxp/build.properties	2009-10-09 13:53:40.224564706 +0100
@@ -65,7 +65,7 @@
 dist.src.zip=${dist.lib.dir}/src.zip
 
 # Where all drop sources live
-drop.dir=./drop
+drop.dir=${output.dir}/drop
 
 # Where patches to drop bundle sources live
 patches.dir=patches
--- old/jaxp/jaxp.properties	2009-10-09 13:53:41.080291743 +0100
+++ new/jaxp/jaxp.properties	2009-10-09 13:53:41.008672595 +0100
@@ -23,7 +23,7 @@
 # have any questions.
 #
 
-drops.master.copy.base=${devtools}/share/jdk7-drops
+drops.master.copy.base=${dropdir}
 drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
 
 jaxp_src.bundle.name=jdk7-jaxp-2009_09_28.zip
--- old/jaxp/make/Makefile	2009-10-09 13:53:41.906964393 +0100
+++ new/jaxp/make/Makefile	2009-10-09 13:53:41.827350360 +0100
@@ -87,14 +87,18 @@
 endif
 
 # Where is /java/devtools in case we need it
-ifdef ALT_JDK_DEVTOOLS_DIR
-  _DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR)
+ifdef ALT_DROP_DIR
+  DROP_DIR = $(ALT_DROP_DIR)
 else
-  _DEVTOOLS = $(_SLASHJAVA)/devtools
+  ifdef ALT_JDK_DEVTOOLS_DIR
+    DROP_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
+  else
+    DROP_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
+  endif
 endif
 
 # Add in path to devtools
-ANT_OPTIONS += -Ddevtools=$(_DEVTOOLS)
+ANT_OPTIONS += -Ddropdir=$(DROP_DIR)
 
 ifdef ALT_OUTPUTDIR
   OUTPUTDIR = $(ALT_OUTPUTDIR)