2003/09/10 05:15:00

darcs-hash:20040130070609-2ba56-9b0d06a4f8757633cd5796fb2e31ebaef4920183.gz

diff --git a/Makefile.upstream b/Makefile.upstream
index 0a3aaa8..1e9a941 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -18,7 +18,6 @@ url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
 url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz
 
 .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
-       rm -rf upstream/darwin-linker/src
        cd upstream/darwin-linker; tar xvzf ../install/powerpc-apple-darwin/cctools-478.tgz
        cd upstream/darwin-linker/src/cctools; for A in ../../patches/*.patch; do patch -p0 < $$A; done
        cp upstream/darwin-linker/src/cctools/ld/fake-mach.c upstream/darwin-linker/src/cctools/libstuff
@@ -94,7 +93,7 @@ vendor: .vendor; @true
        cd upstream/$*/build-$(target); \
                $(setcc) ../src/configure \
                --target=$(target) \
-               --prefix=`pwd`/../../install \
+               --prefix=`cd ../..; pwd`/install \
                $(configure_$*) \
                $(configure_$*-$(target))
        touch $@