Formatting cleanup

2 files changed, 17 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a573617c3cd..6cd4b6cfdbcb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,6 @@ pkgbase = lightmediascanner
 	depends = libvorbis
 	depends = libmp4v2
 	depends = flac
-	options = !libtool
 	source = http://packages.profusion.mobi/lightmediascanner/lightmediascanner-0.4.5.0.tar.bz2
 	md5sums = cb51f52ac8ba514987ae3f5278b628b2
 
diff --git a/PKGBUILD b/PKGBUILD
index 70b2c9ea9082..544594cfa9e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,16 +10,23 @@ arch=('i686' 'x86_64')
 url="http://lms.garage.maemo.org/"
 license=('LGPL')
 depends=('sqlite3' 'libvorbis' 'libmp4v2' 'flac')
-options=('!libtool')
-source=(http://packages.profusion.mobi/lightmediascanner/$pkgname-$pkgver.tar.bz2)
+source=("http://packages.profusion.mobi/lightmediascanner/$pkgname-$pkgver.tar.bz2")
+md5sums=('cb51f52ac8ba514987ae3f5278b628b2')
 
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr \
-	  --disable-static \
-	  --enable-video-dummy \
-	  --enable-audio-dummy || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --disable-static \
+    --enable-video-dummy \
+    --enable-audio-dummy
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 }
-md5sums=('cb51f52ac8ba514987ae3f5278b628b2')