Index: /applications/editors/josm/plugins/colorscheme/build.xml
===================================================================
--- /applications/editors/josm/plugins/colorscheme/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/colorscheme/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
   
   <!-- plugin meta data (enter new version number if anything changed!) -->
Index: /applications/editors/josm/plugins/duplicateway/build.xml
===================================================================
--- /applications/editors/josm/plugins/duplicateway/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/duplicateway/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <property name="ant.build.javac.target" value="1.5"/>
Index: /applications/editors/josm/plugins/grid/build.xml
===================================================================
--- /applications/editors/josm/plugins/grid/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/grid/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
   
   
Index: /applications/editors/josm/plugins/lakewalker/build.xml
===================================================================
--- /applications/editors/josm/plugins/lakewalker/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/lakewalker/build.xml	(revision 6100)
@@ -14,7 +14,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
   
   <property name="josm" location="../../core/dist/josm-custom.jar" />
Index: /applications/editors/josm/plugins/lang/build.xml
===================================================================
--- /applications/editors/josm/plugins/lang/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/lang/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
   
   <property name="ant.build.javac.target" value="1.5"/>
@@ -24,5 +24,5 @@
   <target name="install">
     <mkdir dir="${language}/build"/>
-    <mkdir dir="../dist"/>
+    <mkdir dir="../../dist"/>
     <javac srcdir="${language}/src" classpath="${josm.build.dir}/dist/josm-custom.jar" destdir="${language}/build" />
 
@@ -37,5 +37,5 @@
     <copy file="i18n.properties" todir="${language}/build/org/openstreetmap/josm" />
 
-    <jar destfile="../dist/lang-${language}.jar" basedir="${language}/build">
+    <jar destfile="../../dist/lang-${language}.jar" basedir="${language}/build">
       <manifest>
 	<attribute name="Plugin-Class" value="org.openstreetmap.josm.TranslationLoader_${language}" />
@@ -71,5 +71,5 @@
 
   <target name="clean_lang">
-    <delete file="../dist/lang-${language}.jar" />
+    <delete file="../../dist/lang-${language}.jar" />
     <delete dir="${language}/build"/>
   </target>
Index: /applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- /applications/editors/josm/plugins/livegps/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/livegps/build.xml	(revision 6100)
@@ -14,9 +14,9 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
   
-  <property name="plugin.jar" value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar" value="../../dist/${plugin.name}.jar"/>
   <property name="livegpsplugin.jar" value="${josm.home.dir}/plugins/livegps.jar"/>
   
Index: /applications/editors/josm/plugins/namefinder/build.xml
===================================================================
--- /applications/editors/josm/plugins/namefinder/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/namefinder/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <property name="ant.build.javac.target" value="1.5"/>
@@ -49,5 +49,5 @@
   <!-- install target - copy jar file to plugin destination -->
   <target name="install" depends="dist">
-    <copy file="../dist/${ant.project.name}.jar" todir="${josm.home.dir}/plugins" />
+    <copy file="../../dist/${ant.project.name}.jar" todir="${josm.home.dir}/plugins" />
   </target>
   
Index: /applications/editors/josm/plugins/navigator/build.xml
===================================================================
--- /applications/editors/josm/plugins/navigator/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/navigator/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
   
   <!-- plugin meta data (enter new version number if anything changed!) -->
Index: /applications/editors/josm/plugins/nearclick/build.xml
===================================================================
--- /applications/editors/josm/plugins/nearclick/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/nearclick/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <!-- There's no josm.jar in the svn, so point "josm" to a local copy of your JOSM binary -->
Index: /applications/editors/josm/plugins/openvisible/build.xml
===================================================================
--- /applications/editors/josm/plugins/openvisible/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/openvisible/build.xml	(revision 6100)
@@ -13,7 +13,7 @@
   <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
   <property name="plugin.build.dir" value="build"/>
-  <property name="plugin.dist.dir" value="../dist"/>
+  <property name="plugin.dist.dir" value="../../dist"/>
   <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar" value="${plugin.name}.jar"/>
   
   <!-- plugin meta data (enter new version number if anything changed!) -->
@@ -45,5 +45,5 @@
 	 -->
     
-    <mkdir dir="dist"/>
+    <mkdir dir="${plugin.dist.dir}"/>
     
     <!-- create jar file -->
@@ -77,5 +77,5 @@
 
   <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    <copy file="${plugin.dist.dir}/${plugin.jar}" todir="${josm.plugins.dir}"/>
     <!--
 	<copy todir="${josm.home.dir}/plugins">
@@ -145,5 +145,5 @@
   <delete dir="${plugin.build.dir}" />
   <delete dir="${plugin.site.file}" />
-  <delete file="${plugin.jar}" />
+  <delete file="${plugin.dist.dir}/${plugin.jar}" />
 </target>
 
Index: /applications/editors/josm/plugins/osmarender/build.xml
===================================================================
--- /applications/editors/josm/plugins/osmarender/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/osmarender/build.xml	(revision 6100)
@@ -14,7 +14,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <property name="josm" location="../../core/dist/josm-custom.jar" />
Index: /applications/editors/josm/plugins/plastic_laf/build.xml
===================================================================
--- /applications/editors/josm/plugins/plastic_laf/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/plastic_laf/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <property name="ant.build.javac.target" value="1.5"/>
Index: /applications/editors/josm/plugins/pluginmanager/build.xml
===================================================================
--- /applications/editors/josm/plugins/pluginmanager/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/pluginmanager/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <!-- compilation properties -->
Index: /applications/editors/josm/plugins/slippymap/build.xml
===================================================================
--- /applications/editors/josm/plugins/slippymap/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/slippymap/build.xml	(revision 6100)
@@ -15,7 +15,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <property name="ant.build.javac.target" value="1.5"/>
Index: /applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/surveyor/build.xml	(revision 6100)
@@ -14,9 +14,9 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
-  <property name="livegpsplugin.jar" value="../dist/livegps.jar"/>
+  <property name="livegpsplugin.jar" value="../../dist/livegps.jar"/>
   
   <!-- plugin meta data (enter new version number if anything changed!) -->
Index: /applications/editors/josm/plugins/tagging-preset-tester/build.xml
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <property name="ant.build.javac.target" value="1.5"/>
Index: /applications/editors/josm/plugins/utilsplugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/utilsplugin/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/utilsplugin/build.xml	(revision 6100)
@@ -14,7 +14,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <property name="ant.build.javac.target" value="1.5"/>
Index: /applications/editors/josm/plugins/validator/build.xml
===================================================================
--- /applications/editors/josm/plugins/validator/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/validator/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <!-- point to your JOSM directory -->
Index: /applications/editors/josm/plugins/waypoints/build.xml
===================================================================
--- /applications/editors/josm/plugins/waypoints/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/waypoints/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <!-- point to your JOSM directory -->
Index: /applications/editors/josm/plugins/wmsplugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/wmsplugin/build.xml	(revision 6100)
@@ -14,7 +14,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <property name="ant.build.javac.target" value="1.5"/>
Index: /applications/editors/josm/plugins/ywms/build.xml
===================================================================
--- /applications/editors/josm/plugins/ywms/build.xml	(revision 6099)
+++ /applications/editors/josm/plugins/ywms/build.xml	(revision 6100)
@@ -6,7 +6,7 @@
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.dist.dir"	value="../../dist"/>
   <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
 
   <property name="ant.build.javac.target" value="1.5"/>