minor improvements

2 files changed, 12 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03abb3c2380e..d46958b89d80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lua-llthreads2
 	pkgdesc = This is full dropin replacement for llthreads library
 	pkgver = 0.1.5
-	pkgrel = 2
+	pkgrel = 3
 	url = http://github.com/moteus/lua-llthreads2/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 8941aedb050e..5bb9fff22e0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=lua-llthreads2
 pkgver=0.1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="This is full dropin replacement for llthreads library"
 arch=("i686" "x86_64")
 url="http://github.com/moteus/lua-llthreads2/"
@@ -14,24 +14,24 @@ makedepends=("luarocks")
 source=("$pkgname-$pkgver.tar.gz::https://github.com/moteus/$pkgname/archive/v$pkgver.tar.gz")
 md5sums=('7399462ea97a22243f4d25d293d4b8b3')
 
-build() {
-	_luaver=$($_luacmd -e 'io.write(_VERSION:gsub("^.* (.*)$","%1"),"")')
+prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
+
 	sed -e "s/lua >= 5.1, < 5\.4/lua >= 5.1, <= 5.4/g" -i "rockspecs/$pkgname-$pkgver-1.rockspec"
-	luarocks --lua-version $_luaver make "rockspecs/$pkgname-$pkgver-1.rockspec"
 }
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	_luaver=$($_luacmd -e 'io.write(_VERSION:gsub("^.* (.*)$","%1"),"")')
 
-	install -d                   "$pkgdir`pkg-config --variable=INSTALL_CMOD $_luapkg`"
-	install -Dm755 llthreads2.so "$pkgdir`pkg-config --variable=INSTALL_CMOD $_luapkg`/llthreads2.so"
+	luarocks --lua-version $_luaver --tree="$pkgdir/usr"  make "rockspecs/$pkgname-$pkgver-1.rockspec"
 
-	cd ./src/lua/llthreads2
-	
-	install -d            "$pkgdir`pkg-config --variable=INSTALL_LMOD $_luapkg`"/llthreads2
-	install -Dm644 ex.lua "$pkgdir`pkg-config --variable=INSTALL_LMOD $_luapkg`"/llthreads2/ex.lua
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
+	mkdir -p "$pkgdir/usr/share/doc"
+	mv "$pkgdir/usr/lib/luarocks/rocks-"*"/$pkgname/$pkgver-1/doc" "$pkgdir/usr/share/doc/$pkgname"
+	chmod -R 0644 "$pkgdir/usr/share/doc/$pkgname"/*
+	
+	rm -rf "$pkgdir/usr/lib/luarocks"
 }