From 047d1d662f4042ba55044cf7cf9058673fc4b8ee Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Mon, 16 Dec 2013 09:17:57 +0400
Subject: [PATCH] binutils: resolve conflicts with headers and libs with gdb.
 Place libs and headers in subfolders.

---
 mingw-w64-binutils/PKGBUILD | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mingw-w64-binutils/PKGBUILD b/mingw-w64-binutils/PKGBUILD
index 7b0c74f305..335c52d63a 100644
--- a/mingw-w64-binutils/PKGBUILD
+++ b/mingw-w64-binutils/PKGBUILD
@@ -4,7 +4,7 @@ _realname=binutils
 _mingw_suff=mingw-w64-${CARCH}
 pkgname=("${_mingw_suff}-${_realname}")
 pkgver=2.24
-pkgrel=2
+pkgrel=3
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('any')
 url="http://www.gnu.org/software/binutils/"
@@ -67,10 +67,16 @@ package() {
   cd ${srcdir}/binutils-build
   make DESTDIR=${pkgdir} install
   
+  mkdir -p ${pkgdir}${MINGW_PREFIX}/{lib,include}/binutils
+  mkdir -p ${pkgdir}${MINGW_PREFIX}/${MINGW_CHOST}/include
+  cp ${pkgdir}${MINGW_PREFIX}/include/ansidecl.h ${pkgdir}${MINGW_PREFIX}/${MINGW_CHOST}/include/
+  mv ${pkgdir}${MINGW_PREFIX}/include/*.h ${pkgdir}${MINGW_PREFIX}/include/binutils
+  mv ${pkgdir}${MINGW_PREFIX}/lib/*.a ${pkgdir}${MINGW_PREFIX}/lib/binutils
+  
   # Remove unwanted files
   rm -rf ${pkgdir}${MINGW_PREFIX}/share
   
   # Add some useful headers
-  # install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}${MINGW_PREFIX}/include
-  # install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}${MINGW_PREFIX}/include
+  #install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}${MINGW_PREFIX}/include
+  #install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}${MINGW_PREFIX}/include
 }