summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2020-07-21 05:20:20 +0200
committerFrederic Bezies2020-07-21 05:20:20 +0200
commit4a4c5ba727d926d85f4e37e3591882a9c844cb49 (patch)
treed4d23830a42cb32057f6b04542102419b369105c
parent5d4e7a5932120c586b0d5b881723fe675e7e6a30 (diff)
downloadaur-4a4c5ba727d926d85f4e37e3591882a9c844cb49.tar.gz
fixing /usr/share use
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--stone-soup-tiles-git.desktop2
3 files changed, 8 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f7aaf06399f..ae39372bd4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = stone-soup-tiles-git
pkgdesc = Community maintained variant of Linley's Dungeon Crawl (tiles) - git version
- pkgver = 0.26.a0.r291.g3d11bbfad5
+ pkgver = 0.26.a0.r389.g5bc9781010
pkgrel = 1
url = http://crawl.develz.org
arch = i686
@@ -20,7 +20,7 @@ pkgbase = stone-soup-tiles-git
source = git://github.com/crawl/crawl.git
source = stone-soup-tiles-git.desktop
sha1sums = SKIP
- sha1sums = ce24ff5951fc11717bae3b361f16fde813502d12
+ sha1sums = f598ea37ab97dd34f0d35f33b0b4b3bfc928067d
pkgname = stone-soup-tiles-git
diff --git a/PKGBUILD b/PKGBUILD
index 9cf487a559b..995ea487056 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=stone-soup-tiles-git
_pkgname=crawl
-pkgver=0.26.a0.r291.g3d11bbfad5
+pkgver=0.26.a0.r389.g5bc9781010
pkgrel=1
pkgdesc="Community maintained variant of Linley's Dungeon Crawl (tiles) - git version"
arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ conflicts=('crawl' 'stone-soup-tiles')
source=(git://github.com/crawl/crawl.git
stone-soup-tiles-git.desktop)
sha1sums=('SKIP'
- 'ce24ff5951fc11717bae3b361f16fde813502d12')
+ 'f598ea37ab97dd34f0d35f33b0b4b3bfc928067d')
prepare() {
cd "${srcdir}/${_pkgname}"
@@ -31,7 +31,8 @@ pkgver() {
build() {
cd "${srcdir}/${_pkgname}/crawl-ref/source"
- make DESTDIR="${pkgdir}" \
+ make prefix=/usr/bin \
+ DESTDIR="${pkgdir}" \
SAVEDIR="~/.crawl/" \
DATADIR="/usr/share/${pkgname}/data" \
TILES=y SAVEDIR='~/.crawl'
@@ -40,7 +41,7 @@ build() {
package() {
cd "${srcdir}/${_pkgname}/crawl-ref/source"
- make install prefix="${pkgdir}/usr/share/" TILES=y SAVEDIR='~/.crawl'
+ make install prefix="${pkgdir}/usr/" DATADIR="${pkgdir}/usr/share/${pkgname}/data" TILES=y SAVEDIR='~/.crawl'
mkdir -p $pkgdir/usr/share/{applications,pixmaps}
cp ${srcdir}/${_pkgname}/crawl-ref/source/dat/tiles/stone_soup_icon-32x32.png $pkgdir/usr/share/pixmaps/$pkgname.png
cp $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/
diff --git a/stone-soup-tiles-git.desktop b/stone-soup-tiles-git.desktop
index d9643bb55d0..087dabac6de 100644
--- a/stone-soup-tiles-git.desktop
+++ b/stone-soup-tiles-git.desktop
@@ -7,5 +7,5 @@ Name=Stone Soup
GenericName=Crawl Stone Soup
Comment=Community maintained variant of Linley's Dungeon Crawl - git version
Icon=stone-soup-tiles-git.png
-Exec=/usr/share/bin/crawl
+Exec=/usr/bin/crawl
Categories=Game;ArcadeGame