summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorraingloom2017-05-02 21:43:16 +0200
committerraingloom2017-05-02 21:43:16 +0200
commit2f53f6e08ad34fc21c364f6be84c17827e043971 (patch)
tree3ea46712ab33027dd4a5e3141a1b5a859667cb91
parentc97eb6c56b666c09aa98959db4c01f2e2405ab39 (diff)
downloadaur-2f53f6e08ad34fc21c364f6be84c17827e043971.tar.gz
fixed all file conflicts... for now
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD19
2 files changed, 16 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index de5e4eb1d6d..e4ae64cce9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = eris
pkgdesc = Heavy Duty Persistence for Lua 5.3
pkgver = 1.1.2
- pkgrel = 2
+ pkgrel = 4
url = https://github.com/fnuecke/eris
arch = any
license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 9755267ebbf..e5515a23050 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.1.2
_luaname=lua
_luaver='5.3.4'
_majorver=${_luaver%.*}
-pkgrel=2
+pkgrel=4
pkgdesc='Heavy Duty Persistence for Lua 5.3'
arch=('any')
url='https://github.com/fnuecke/eris'
@@ -45,10 +45,9 @@ package() {
TO_LIB="liblua.a liblua.so liblua.so.$_majorver liblua.so.$_luaver" \
INSTALL_DATA='cp -d' \
INSTALL_TOP="$pkgdir"/usr \
+ INSTALL_INC="$pkgdir"/usr/include/$pkgname \
INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
install
- mv "$pkgdir"/usr/bin/lua "$pkgdir"/usr/bin/eris
- mv "$pkgdir"/usr/bin/luac "$pkgdir"/usr/bin/erisc
ln -sf /usr/bin/$pkgname "$pkgdir"/usr/bin/$pkgname$_majorver
ln -sf /usr/bin/"$pkgname"c "$pkgdir"/usr/bin/"$pkgname"c$_majorver
@@ -56,6 +55,18 @@ package() {
install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/${pkgname}53.pc
ln -sf /usr/lib/pkgconfig/${pkgname}53.pc "$pkgdir"/usr/lib/pkgconfig/$pkgname.pc
- install -d "$pkgdir"/usr/share/doc/$pkgname
+ mv "$pkgdir"/usr/bin/lua "$pkgdir"/usr/bin/$pkgname
+ mv "$pkgdir"/usr/bin/luac "$pkgdir"/usr/bin/"$pkgname"c
+
+ mv "$pkgdir"/usr/lib/liblua.so \
+ "$pkgdir"/usr/lib/liblua-"$pkgname".so
+ mv "$pkgdir"/usr/lib/liblua.so."$_majorver" \
+ "$pkgdir"/usr/lib/liblua-"$pkgname$_majorver".so
+ mv "$pkgdir"/usr/lib/liblua.so."$_luaver" \
+ "$pkgdir"/usr/lib/liblua-eris.so."$_luaver"
+ mv "$pkgdir"/usr/lib/liblua.a \
+ "$pkgdir"/usr/lib/liblua-eris.a
+
+ #install -d "$pkgdir"/usr/share/doc/$pkgname
install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}