Merge branch 'master' of git://git.hcoop.net/git/crawshaw/fleet

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 79a028e..aa5881a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
          done
        javac -classpath lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
        echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
-       cd build/class/; jar cmf manifest ../../$@ .
+       jar cmf build/class/manifest $@ ships -C build/class .
 
 
 ## Fpga ####################################################################################