2003/05/10 05:36:27

darcs-hash:20040130070006-0c9ea-2be402736158acaa29dd8c010ac328778319b7f6.gz

diff --git a/Makefile b/Makefile
index 2c80eb2..5cd2d79 100644 (file)
--- 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