Package updated.

1 files changed, 7 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4f2ee046c843..01c2571a5997 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,18 @@
-# PKGBUILD for android-lame
 # Maintainer: Gonzalo Exequiel Pedone <hipersayan DOT x AT gmail DOT com>
 
 _android_arch=x86-64
-source android-env.sh ${_android_arch}
+source android-env ${_android_arch}
 
 pkgname=android-${_android_arch}-lame
 pkgver=3.100
-pkgrel=4
+pkgrel=5
 pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder (android)"
 arch=('any')
 url="http://lame.sourceforge.net/"
 license=('LGPL')
 depends=('android-ndk')
 options=(!strip !buildflags staticlibs !emptydirs)
-makedepends=('android-pkg-config' 'nasm')
+makedepends=('android-configure' 'nasm')
 source=("http://downloads.sourceforge.net/lame/lame-$pkgver.tar.gz")
 md5sums=('83e260acbe4389b54fe08e0bdbf7cddb')
 
@@ -24,20 +23,7 @@ prepare() {
 build() {
     cd "${srcdir}"/lame-${pkgver}
 
-    export CC=${ANDROID_CC}
-    export CXX=${ANDROID_CXX}
-    export PKG_CONFIG=${ANDROID_PKGCONFIG}
-    target=${_android_arch/x86-/x86_}-linux-android
-
-    ./configure \
-        --host=${target} \
-        --target=${target} \
-        --build="$CHOST" \
-        --prefix=${ANDROID_LIBS} \
-        --libdir=${ANDROID_LIBS}/lib \
-        --includedir=${ANDROID_LIBS}/include \
-        --enable-shared \
-        --enable-static \
+    android-${_android_arch}-configure \
         --disable-frontend \
         --enable-nasm
 
@@ -48,7 +34,7 @@ package() {
     cd "${srcdir}"/lame-${pkgver}
 
     make DESTDIR="$pkgdir" install
-    rm -r "${pkgdir}"/${ANDROID_LIBS}/share
-    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_LIBS}/lib/*.so
-    ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_LIBS}/lib/*.a
+    rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
+    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
+    ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }