Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 16006)
+++ /trunk/build.xml	(revision 16007)
@@ -230,5 +230,5 @@
                    shortversion="${version.entry.commit.revision} SVN"
                    version="${version.entry.commit.revision} SVN"
-                   icon="macosx/JOSM.app/Contents/Resources/JOSM.icns"
+                   icon="native/macosx/JOSM.app/Contents/Resources/JOSM.icns"
                    highResolutionCapable="true">
 
@@ -258,5 +258,5 @@
             <remove path="/plist/dict/key[text()='CFBundleDocumentTypes']|/plist/dict/key[text()='CFBundleDocumentTypes']/following-sibling::array[1]"/>
             <!-- insert our own keys -->
-            <insert position="before" path="/plist/dict/key[1]" file="macosx/JOSM.app/Contents/Info.plist_template.xml" />
+            <insert position="before" path="/plist/dict/key[1]" file="native/macosx/JOSM.app/Contents/Info.plist_template.xml" />
         </xmltask>
 
@@ -275,5 +275,5 @@
     <!-- Windows target -->
     <target name="distwin" depends="dist">
-        <exec dir="windows" executable="./josm-setup-unix.sh">
+        <exec dir="native/windows" executable="./josm-setup-unix.sh">
             <arg value="${version.entry.commit.revision}"/>
             <arg value="${dist.jar}"/>
@@ -492,5 +492,5 @@
         </sequential>
     </macrodef>
-    <target name="test-compile" depends="test-init,compile,epsg">
+    <target name="test-compile" depends="test-init,compile,extract-libraries,epsg">
         <call-javac testfamily="unit">
             <cp-elements>