[arch-commits] Commit in libelf/repos (core-x86_64 core-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Friday, December 5, 2008 @ 08:33:12
  Author: jgc
Revision: 20526

Fix conflict

Modified:
  libelf/repos/core-x86_64/	(properties)
  libelf/repos/core-x86_64/PKGBUILD

----------+
 PKGBUILD |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)


Property changes on: libelf/repos/core-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libelf/trunk:1
   + /libelf/trunk:1-20525

Modified: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2008-12-05 13:31:11 UTC (rev 20525)
+++ core-x86_64/PKGBUILD	2008-12-05 13:33:12 UTC (rev 20526)
@@ -1,23 +1,22 @@
 # $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: arjan <arjan at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=libelf
 pkgver=0.8.10
-pkgrel=3.1
+pkgrel=3
 pkgdesc="libelf is a free ELF object file access library"
 arch=(i686 x86_64)
 license=('GPL')
-source=(http://www.mr511.de/software/$pkgname-$pkgver.tar.gz)
+source=(http://www.mr511.de/software/${pkgname}-${pkgver}.tar.gz)
 url="http://directory.fsf.org/libs/misc/libelf.html"
 depends=('glibc')
-options=(!makeflags)
 md5sums=('9db4d36c283d9790d8fa7df1f4d7b4d9')
 
 build() {
-    cd $startdir/src/$pkgname-$pkgver
-    ./configure --prefix=/usr --enable-shared --enable-gnu-names || return 1
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure --prefix=/usr --enable-shared \
+      --enable-gnu-names --enable-compat || return 1
     make || return 1
-    make prefix=$startdir/pkg/usr install || return 1
+    make prefix="${pkgdir}/usr" install || return 1
 }