[arch-commits] Commit in binutils/trunk (PKGBUILD)

[Allan McRae]

    Date: Wednesday, October 6, 2010 @ 23:16:46
  Author: allan
Revision: 94402

upgpkg: binutils 2.20.1-4
add demangling header

Modified:
  binutils/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-07 01:54:46 UTC (rev 94401)
+++ PKGBUILD	2010-10-07 03:16:46 UTC (rev 94402)
@@ -5,7 +5,7 @@
 
 pkgname=binutils
 pkgver=2.20.1
-pkgrel=3
+pkgrel=4
 _date=20100521
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
@@ -38,20 +38,21 @@
     ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared
   fi
   # fix man files install path
-  sed -i -e "s:mandir \= \/usr\/share:mandir \= ${pkgdir}\/usr\/share:" ${srcdir}/build/Makefile || return 1
+  sed -i -e "s:mandir \= \/usr\/share:mandir \= ${pkgdir}\/usr\/share:" ${srcdir}/build/Makefile
   # fix info files install path
-  sed -i -e "s:infodir \= \/usr\/share:infodir \= ${pkgdir}\/usr\/share:" ${srcdir}/build/Makefile || return 1
+  sed -i -e "s:infodir \= \/usr\/share:infodir \= ${pkgdir}\/usr\/share:" ${srcdir}/build/Makefile 
 
   # This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
-  make configure-host || return 1
+  make configure-host
 
-  make tooldir=${pkgdir}/usr || return 1
+  make tooldir=${pkgdir}/usr
 }
 
 package() {
   cd ${srcdir}/build
   make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
   install -m644 ${srcdir}/include/libiberty.h ${pkgdir}/usr/include
+  install -m644 ${srcdir}/include/demangle.h ${pkgdir}/usr/include
 
   # Rebuild libiberty.a with -fPIC
   make -C libiberty clean