X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5cd2d79e9fa011407d2c28d17c299993a70d0ae2;hb=fc3d3e7efa26add1306f565f8c739f9e0a64588c;hp=2c80eb27225a5f71f9fc87b875447dd6f24fe6bb;hpb=07f037ed4572cfec2432a522bc146013daf0fb97;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 2c80eb2..5cd2d79 100644
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,7 @@ $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
 	$(gcc) -Ibin -c $< -o $@
 
 upstream:
-	cvs -d :pserver:cvs@cvs.xwt.org:/ export upstream HEAD
+	cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
 
 upstream/Carbon/include/Carbon:
 	# A disgusting hack to create symlinks to the OS X Framework headers, since the
@@ -232,13 +232,13 @@ Win32:
 
 Darwin: upstream
 	echo -e "\\n=== Darwin ========================================="
-	ranlib upstream/darwin/*.a
-	ar x /usr/lib/libcc_dynamic.a upstream/darwin/darwin-fpsave.o
+	ranlib upstream/Darwin/lib/*.a
+	ar x /usr/lib/libcc_dynamic.a upstream/Darwin/lib/darwin-fpsave.o
 	make gcj \
 		platform=Darwin \
 		target=powerpc-apple-darwin \
 		target_bin=xwt.darwin \
-		platform_link="upstream/darwin/*.[oa] $(gcc_path)/lib/libgcj.a" \
+		platform_link="upstream/Darwin/lib/*.[oa] $(gcc_path)/lib/libgcj.a" \
 		platform_java_sources="POSIX X11"
 
 Carbon: upstream/Carbon/include/Carbon upstream