Use pkgname prefixed tarball to allow a shared SRCDEST

2 files changed, 22 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b366422ad122..111defe83f9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lua-psl
 	pkgver = 0.3
-	pkgrel = 0
+	pkgrel = 1
 	url = https://github.com/daurnimator/lua-psl
 	arch = i686
 	arch = x86_64
@@ -9,7 +9,7 @@ pkgbase = lua-psl
 	makedepends = lua51
 	makedepends = lua52
 	depends = libpsl
-	source = https://github.com/daurnimator/lua-psl/archive/v0.3.tar.gz
+	source = lua-psl-0.3.tar.gz::https://github.com/daurnimator/lua-psl/archive/v0.3.tar.gz
 	md5sums = 9171823dbd4d347a5aa1150710cc991d
 
 pkgname = lua-psl
diff --git a/PKGBUILD b/PKGBUILD
index 53e0088cfee5..b2c1419bc1ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,49 @@
 # Maintainer: Daurnimator <quae@daurnimator.com>
 
-pkgname=(lua-psl lua51-psl lua52-psl)
+pkgname=('lua-psl' 'lua51-psl' 'lua52-psl')
 pkgver=0.3
-pkgrel=0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='https://github.com/daurnimator/lua-psl'
 license=('MIT')
 makedepends=('lua' 'lua51' 'lua52')
 depends=('libpsl')
-source=("https://github.com/daurnimator/lua-psl/archive/v${pkgver}.tar.gz")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/daurnimator/lua-psl/archive/v$pkgver.tar.gz")
 md5sums=('9171823dbd4d347a5aa1150710cc991d')
 
 build() {
-	cd lua-psl-"$pkgver"
-	gcc -fPIC ${CPPFLAGS} ${CFLAGS} -o psl/psl.o -c psl/psl.c
-	gcc -shared ${LDFLAGS} -o psl.so psl/psl.o -lpsl
+	cd "lua-psl-$pkgver"
 
-	gcc -fPIC -I/usr/include/lua5.1 ${CPPFLAGS} ${CFLAGS} -o psl/psl.o -c psl/psl.c
-	gcc -shared ${LDFLAGS} -o psl-5.1.so psl/psl.o -lpsl
+	gcc -fPIC $CPPFLAGS $CFLAGS -o psl/psl.o -c psl/psl.c
+	gcc -shared $LDFLAGS -o psl.so psl/psl.o -lpsl
 
-	gcc -fPIC -I/usr/include/lua5.2 ${CPPFLAGS} ${CFLAGS} -o psl/psl.o -c psl/psl.c
-	gcc -shared ${LDFLAGS} -o psl-5.2.so psl/psl.o -lpsl
+	gcc -fPIC $CPPFLAGS $CFLAGS -I/usr/include/lua5.1 -o psl/psl.o -c psl/psl.c
+	gcc -shared $LDFLAGS -o psl-5.1.so psl/psl.o -lpsl
+
+	gcc -fPIC $CPPFLAGS $CFLAGS -I/usr/include/lua5.2 -o psl/psl.o -c psl/psl.c
+	gcc -shared $LDFLAGS -o psl-5.2.so psl/psl.o -lpsl
 }
 
 package_lua-psl() {
 	pkgdesc='libpsl bindings for Lua 5.3'
 
-	cd lua-psl-"$pkgver"
-	install -D psl.so "$pkgdir"/usr/lib/lua/5.3/psl.so
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	cd "lua-psl-$pkgver"
+	install -D psl.so "$pkgdir/usr/lib/lua/5.3/psl.so"
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_lua51-psl() {
 	pkgdesc='libpsl bindings for Lua 5.1'
 
-	cd lua-psl-"$pkgver"
-	install -D psl-5.1.so "$pkgdir"/usr/lib/lua/5.1/psl.so
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	cd "lua-psl-$pkgver"
+	install -D psl-5.1.so "$pkgdir/usr/lib/lua/5.1/psl.so"
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_lua52-psl() {
 	pkgdesc='libpsl bindings for Lua 5.2'
 
-	cd lua-psl-"$pkgver"
-	install -D psl-5.2.so "$pkgdir"/usr/lib/lua/5.2/psl.so
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	cd "lua-psl-$pkgver"
+	install -D psl-5.2.so "$pkgdir/usr/lib/lua/5.2/psl.so"
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }