From 8d1ed89d875e46ea63f8d44fb5f1c85e5418a122 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 15 Jul 2011 12:35:40 +0200
Subject: [PATCH] mingw-w64-binutils: improve installation dirs.

---
 srcpkgs/mingw-w64-binutils/template | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/mingw-w64-binutils/template b/srcpkgs/mingw-w64-binutils/template
index a0e4d1b754..a976afd89f 100644
--- a/srcpkgs/mingw-w64-binutils/template
+++ b/srcpkgs/mingw-w64-binutils/template
@@ -35,22 +35,22 @@ wrksrc=binutils-$version
 
 _mingwprefix=/opt
 
-if [ "${xbps_machine}" = "x86_64" ]; then
-	_mingwtriplet="${xbps_machine}-w64-mingw32"
-	_target_args="--enable-targets=${_mingwtriplet},i686-w64-mingw32"
-	_multilib_args="--enable-multilib --enable-64-bit-bfd"
-else
-	_mingwtriplet="${xbps_machine}-w32-mingw32"
-	_target_args="--enable-targets=${_mingwtriplet}"
-	_multilib_args="--disable-multilib"
-fi
-
 do_build()
 {
-	./configure --prefix=${_mingwprefix} --enable-threads \
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		_mingwtriplet="${xbps_machine}-w64-mingw32"
+		_target_args="--enable-targets=${_mingwtriplet},i686-w64-mingw32"
+		_multilib_args="--enable-multilib --enable-64-bit-bfd"
+	else
+		_mingwtriplet="${xbps_machine}-w32-mingw32"
+		_target_args="--enable-targets=${_mingwtriplet}"
+		_multilib_args="--disable-multilib"
+	fi
+
+	./configure --prefix=${_mingwprefix} --bindir=${_mingwprefix}/bin \
 		--target=${_mingwtriplet} ${_target_args} ${_multilib_args} \
 		--enable-plugins --enable-secureplt --with-mmap --disable-nls \
-		--exec-prefix=${_mingwprefix}/${_mingwtriplet}
+		--enable-threads
 
 	make ${makejobs}
 }
@@ -60,7 +60,7 @@ do_install()
 	make DESTDIR=${DESTDIR} install
 
 	# Remove lib64 directory and it's only file: libiberty.a
-	rm -rf ${DESTDIR}/${_mingwprefix}/${_mingwtriplet}/lib64
+	rm -rf ${DESTDIR}/${_mingwprefix}/lib64
 
 	# Remove useless manpages
 	rm -rf ${DESTDIR}/${_mingwprefix}/share