X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=8967d346d46d4c3720fdde555c30afaea951c0bf;hb=4bfbd84a236e778dbf87137af488194f29a7102e;hp=9ad8b4cb33c4ef9ce0661c45d9da59ec95d1284c;hpb=9835d9bbac931f8e76ad377674fb47a7f0da01e3;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 9ad8b4c..8967d34 100644
--- a/Makefile
+++ b/Makefile
@@ -171,7 +171,7 @@ src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.pa
 	cd src/org/ijg/; tar xzf jpegsrc.v6b.tar.gz
 	cd src/org/ijg/jpeg-6b; ./configure --target=$(target)
 	cd src/org/ijg/jpeg-6b; mv $(jpeg_c_sources) $(jpeg_headers) ..
-	cd src/org/ijg; patch -p0 < jmorecfg.h.patch
+	cd src/org/ijg; patch -l -p0 < jmorecfg.h.patch
 	rm -rf src/org/ijg/jpeg-6b
 
 $(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
@@ -293,11 +293,11 @@ dist-private:
 	make $(silent) update-build
 
 	# preserve gcc across builds so we don't have to remake it
-	mv gcc/Makefile Makefile.gcc
 	mkdir -p $(HOME)/dist.xwt.org-gcc
-	rm -rf gcc
+	mv gcc gcc-
 	ln -s $(HOME)/dist.xwt.org-gcc gcc
-	mv Makefile.gcc gcc/Makefile
+	mv -f gcc-/Makefile gcc/
+	mv -f gcc-/gcc.patch gcc/
 
 	# build it
 	nice -n 19 make all