summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFichteFoll2020-04-20 23:22:23 +0200
committerFichteFoll2020-04-20 23:22:23 +0200
commit89b242ad1147023b8583ccddd378f4678ab172a3 (patch)
tree3629af4057a49d4d162d34da4571e187d0a8ce31
parent42f561a1c4251fa206f61195a93ca45a182f473d (diff)
downloadaur-89b242ad1147023b8583ccddd378f4678ab172a3.tar.gz
Use newly configured install target
-rw-r--r--.SRCINFO4
-rw-r--r--OpenRiichi.desktop3
-rw-r--r--PKGBUILD14
3 files changed, 10 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 40c54ae559b0..4a9b6f54b934 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = open-riichi-git
pkgdesc = An open source riichi (Japanese) mahjong client
- pkgver = 0.2.0.3.r19.g9d28fb1
+ pkgver = 0.2.0.3.r42.gac1e975
pkgrel = 1
url = https://github.com/FluffyStuff/OpenRiichi
arch = x86_64
@@ -22,7 +22,7 @@ pkgbase = open-riichi-git
source = OpenRiichi.desktop
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = fa43b7e9477b3cba48e9a0f50699a480d0b1c12320c950f9b4465eb1d9b4a742
+ sha256sums = 49f93bb7a1cb9b128a0a2137438ee7723cd3e9826b59dfafa5ccee83195961d0
pkgname = open-riichi-git
diff --git a/OpenRiichi.desktop b/OpenRiichi.desktop
index 3ac31d7710aa..3e544cdda7aa 100644
--- a/OpenRiichi.desktop
+++ b/OpenRiichi.desktop
@@ -3,8 +3,7 @@ Version=1.0
Name=OpenRiichi
Comment=Japanese Mahjong
Categories=Game
-Path=/opt/OpenRiichi
-Exec=/opt/OpenRiichi/OpenRiichi
+Exec=/usr/bin/OpenRiichi
Terminal=false
Icon=/usr/share/pixmaps/OpenRiichi.png
Type=Application
diff --git a/PKGBUILD b/PKGBUILD
index d236dac5981e..10bf5710da1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: FichteFoll <fichtefoll2@googlemail.com>
pkgname=open-riichi-git
-pkgver=0.2.0.3.r19.g9d28fb1
+pkgver=0.2.0.3.r42.gac1e975
pkgrel=1
pkgdesc='An open source riichi (Japanese) mahjong client'
arch=('x86_64')
@@ -14,7 +14,7 @@ source=('OpenRiichi::git+https://github.com/FluffyStuff/OpenRiichi.git'
'OpenRiichi.desktop')
sha256sums=('SKIP'
'SKIP'
- 'fa43b7e9477b3cba48e9a0f50699a480d0b1c12320c950f9b4465eb1d9b4a742')
+ '49f93bb7a1cb9b128a0a2137438ee7723cd3e9826b59dfafa5ccee83195961d0')
pkgver() {
cd OpenRiichi
@@ -29,20 +29,20 @@ prepare() {
git config submodule.Engine.url "${srcdir}/Engine"
git submodule update
- meson bin -Dbuildtype=release
+ meson build -Dbuildtype=release
}
build() {
cd OpenRiichi
- ninja -C bin
+ ninja -C build
}
package() {
install -Dm 644 OpenRiichi.desktop -t "${pkgdir}"/usr/share/applications
cd OpenRiichi
- mkdir -p "${pkgdir}/opt/OpenRiichi"
- cp -r bin/* "${pkgdir}/opt/OpenRiichi"
+ DESTDIR="${pkgdir}" ninja -C build install
install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
- install -Dm 644 bin/Data/Icon.png "${pkgdir}/usr/share/pixmaps/OpenRiichi.png"
+ install -d "${pkgdir}/usr/share/pixmaps/"
+ ln -s /usr/share/OpenRiichi/Data/Icon.png "${pkgdir}/usr/share/pixmaps/OpenRiichi.png"
}