From 667963e47d85032e61e737303dbb7ea2a593a5aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergi=20=C3=80lvarez=20i=20Capilla?= <pancake@nowsecure.com>
Date: Thu, 3 May 2018 19:59:15 +0200
Subject: [PATCH] Fix ARCH and r2 plugin path

---
 dist/debian/Makefile | 9 ++++-----
 dist/deps.sh         | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dist/debian/Makefile b/dist/debian/Makefile
index 15fb20a0..46bbfadb 100644
--- a/dist/debian/Makefile
+++ b/dist/debian/Makefile
@@ -1,13 +1,12 @@
 include ./CONFIG
 
 DEPENDS=
-ARCH=amd64
-ARCH=x64
+CROSSARCH=x64
 PWD=$(shell pwd)
 PACKAGE_DIR?=${PWD}
 
 DOCKCROSS=$(PWD)/../dockcross
-R2PLUGDIR=/usr/lib/radare2/last
+R2PLUGDIR=/usr/lib/radare2/$(VERSION)
 
 
 all: root
@@ -19,8 +18,8 @@ all: root
 	${MAKE} deb
 
 root:
-	cd ../.. ; \
-	$(DOCKCROSS) --image dockcross/linux-$(ARCH) bash -c \
+	cd ../.. && \
+	$(DOCKCROSS) --image dockcross/linux-$(CROSSARCH) bash -c \
 	"R2_PLUGDIR=$(R2PLUGDIR) DESTDIR=$(PWD)/root bash dist/deps.sh"
 	mkdir -p root/$(R2PLUGDIR)
 	cp ../../io_frida.so root/$(R2PLUGDIR)
diff --git a/dist/deps.sh b/dist/deps.sh
index 48c2b2e4..5329d89d 100755
--- a/dist/deps.sh
+++ b/dist/deps.sh
@@ -2,7 +2,6 @@ RV=2.5.0
 RA=amd64
 wget -c http://radare.mikelloc.com/get/${RV}/radare2_${RV}_${RA}.deb
 wget -c http://radare.mikelloc.com/get/${RV}/radare2-dev_${RV}_${RA}.deb
-#wget -c http://www.radare.org/get/debian/radare2-dev_${RV}_${RA}.deb
 sudo dpkg -i radare2_${RV}_${RA}.deb
 sudo dpkg -i radare2-dev_${RV}_${RA}.deb