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

diff --git a/Makefile b/Makefile
index 2c80eb2..9b58464 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%.cc.o)
 c_objects              := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
 
 # tools
-gcc_path               := $(shell pwd)/gcc
+gcc_path               := $(shell pwd)/gcc/install
 #gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions
 #gcc_optimzations       += -funroll-loops -ffunction-sections -fdata-sections
 gcc_optimizations      := -O0
@@ -137,7 +137,7 @@ propose-patch:
 ## GCJ-Derived Platforms #######################################################################
 
 # if the user doesn't change gcc_path, and it's not built, then we'll try to build it
-$(shell pwd)/gcc/bin/$(target)-gcj:
+$(shell pwd)/gcc/install/bin/$(target)-gcj:
 	make -C gcc
 
 # java_classes is here to force compilation of the .class files (they get used via -Ibin/) without
@@ -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