X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5d4afb1b8016e8096e7157fd74e7db6ec24ea396;hb=7e70c72cac0052b5c31931898dcf2708225ce86e;hp=55903b33d60d373702e2c9ba6b6ab224d7981f65;hpb=d529f632847ce4a0d322648b389c9848ac04da49;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 55903b3..5d4afb1 100644
--- a/Makefile
+++ b/Makefile
@@ -187,10 +187,11 @@ $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
 upstream:
 	cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
 
-upstream/Carbon/include/Carbon:
+upstream/Carbon/include/Carbon: upstream
 	# A disgusting hack to create symlinks to the OS X Framework headers, since the
 	# standard GCC doesn't know how to search Frameworks for header files.
 	outdir="upstream/Carbon/include"; \
+	mkdir -p $$outdir; \
 	librarydir="/System/Library"; \
 	frameworksubdir="Frameworks"; \
 	cd $$outdir; \
@@ -214,7 +215,7 @@ Linux:
 	echo -e "\\n=== Linux ========================================="
 	make gcj \
 		platform=Linux \
-		target=i686-pc-gnu-linux \
+		target=i686-pc-linux-gnu \
 		target_bin=xwt.linux \
 		platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
 		platform_java_sources="POSIX X11"
@@ -241,6 +242,7 @@ 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 \
@@ -286,8 +288,7 @@ dist: compile
 		tail -n 200 .make-dist.out | \
 			mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
-		ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch_flag) \
-			| grep -v "make...:.\(Entering\|Leaving\).directory"
+		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"
         endif