From ef548bf55f00820a35eb746fca1b6f860e636ef9 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Fri, 11 Nov 2011 13:09:42 +0100
Subject: [PATCH] * Fix w32dist (copy missing libs, create dirs, ..) * Restore
 farm targets

---
 r2-bindings/Makefile | 11 +++++++++--
 sys/farm/CONFIG      |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/r2-bindings/Makefile b/r2-bindings/Makefile
index 4f101b8a38..0e41f70ef2 100644
--- a/r2-bindings/Makefile
+++ b/r2-bindings/Makefile
@@ -37,13 +37,20 @@ w32:
 	cd python && ${MAKE} w32
 
 DSTNAME=radare2-bindings-w32-$(VERSION)
-DST=../$(DSTNAME)/Python27/Lib/r2
+DST=../$(DSTNAME)/Python27/Lib/site-packages/r2
+SJLJ=/usr/i486-mingw32/bin/libgcc_s_sjlj-1.dll
+STDC=/usr/i486-mingw32/bin/libstdc++-6.dll
 
 w32dist:
-	rm -rf ${DST}/*
+	rm -rf ../${DSTNAME}
 	mkdir -p ${DST}
 	cp -f python/*.dll ${DST}
 	cp -f python/r_*.py ${DST}
+	:> ${DST}/__init__.py
+	cd ${DST} ; for a in *.dll ; do mv $$a `echo $$a | sed -e s,dll,pyd,g` ; done
+	# Copy missing libraries
+	-cp -f ${SJLJ} ${DST}
+	-cp -f ${STDC} ${DST}
 	cd .. ; zip -r $(DSTNAME).zip $(DSTNAME)
 
 .PHONY: w32dist dist w32 check check-w32 vdoc vdoc_pkg
diff --git a/sys/farm/CONFIG b/sys/farm/CONFIG
index 5157e2d73a..d598ad8e55 100644
--- a/sys/farm/CONFIG
+++ b/sys/farm/CONFIG
@@ -24,6 +24,6 @@ TARGETS="
 	android-arm
 	android-x86
 "
-TARGETS=android-arm
+#TARGETS=android-arm
 
 # mingw64 maemo