X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=003361ba65b1ea3c5db400bde3876ac10c9c2e51;hb=186c863f9158bf7bea588e0b12267938227c8088;hp=cff7799af19167baefb6e116275bf1a19a32a84a;hpb=938e5c324bffa498e8baea43335f961a0a764ae8;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index cff7799..003361b 100644
--- a/Makefile
+++ b/Makefile
@@ -242,7 +242,6 @@ Darwin: upstream
 
 Carbon: upstream/Carbon/include/Carbon upstream
 	echo -e "\\n=== Carbon ========================================="
-	cd gcc/install/bin; ln -sf gcjh powerpc-apple-darwin-gcjh
 	make gcj \
 		platform=Carbon \
 		target=powerpc-apple-darwin \
@@ -288,7 +287,7 @@ dist: compile
 		tail -n 200 .make-dist.out | \
 			mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
-		echo 'cd /home/xwt;date=`date +%d-%b-%H%M`;mkdir xwt-$$date;cd xwt-$$date;/usr/bin/cvs -d /cvs co $(this_branch_flag) xwt;mv xwt/* .;mv xwt/.* .;rmdir xwt;touch .make-dist.out;nohup make dist &> /dev/null &;echo;cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &> /dev/null &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
 
@@ -300,7 +299,7 @@ dist-private:
 	mv gcc gcc-
 	ln -s $(HOME)/dist.xwt.org-gcc gcc
 	mv -f gcc-/Makefile gcc/
-	mv -f gcc-/gcc.patch gcc/
+	mv -f gcc-/*.patch gcc/
 
 	# build it
 	nice -n 19 make all