Fix installation problems.

2 files changed, 11 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a164c845e9d..78b51465b106 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opentyrian
 	pkgdesc = Open Source port of the classic DOS shoot-em-up Tyrian
 	pkgver = 2.1.20130907.r119.g650e1f7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/opentyrian/opentyrian
 	arch = i686
 	arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = opentyrian
 	depends = sdl2
 	depends = sdl2_net
 	optdepends = hicolor-icon-theme: .desktop file icons
+	provides = tyrian
 	source = git+https://github.com/opentyrian/opentyrian#commit=650e1f72fd18d2242d10d706afa7f77f80151aea
 	source = http://camanis.net/tyrian/tyrian21.zip
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ad967e6ee987..54bb4eee391e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,13 @@
 
 pkgname=opentyrian
 pkgver=2.1.20130907.r119.g650e1f7
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source port of the classic DOS shoot-em-up Tyrian"
 url="https://github.com/opentyrian/opentyrian"
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('sdl2' 'sdl2_net')
+provides=('tyrian')
 optdepends=('hicolor-icon-theme: .desktop file icons')
 source=("git+https://github.com/opentyrian/opentyrian#commit=650e1f72fd18d2242d10d706afa7f77f80151aea"
         "http://camanis.net/tyrian/tyrian21.zip")
@@ -17,7 +18,7 @@ sha256sums=('SKIP'
             '7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277')
 
 pkgver() {
-	cd opentyrian
+	cd "$pkgname"
 	git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
@@ -26,23 +27,17 @@ build() {
 }
 
 package() {
-	cd $pkgname
+	cd "$pkgname"
+	make DESTDIR="$pkgdir" prefix=/usr install
 
-	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
-	install -Dm644 linux/man/$pkgname.6 "$pkgdir"/usr/share/man/man6/$pkgname.6
-	install -Dm644 linux/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-	install -Dm644 linux/icons/tyrian-48.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
-	install -d "$pkgdir"/usr/share/{opentyrian/data,doc/$pkgname}
-	install -m644 {README,CREDITS} "$pkgdir"/usr/share/doc/$pkgname
+	install -Dm644 "linux/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 	install -Dm644 "COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	for _x in 22 24 32 48 128; do
 		install -Dm644 "linux/icons/tyrian-$_x.png" \
-			"$pkgdir"/usr/share/icons/hicolor/${_x}x${_x}/apps/$pkgname.png
+			"$pkgdir/usr/share/icons/hicolor/${_x}x${_x}/apps/$pkgname.png"
 	done
 
 	cd ../tyrian21
-	for _x in *.{dat,lvl,shp,snd,mus,anm} demo.* tyrian.{cdt,hdt,pic} tshp2.pcx;
-	do
-		install -m644 "$_x" "$pkgdir"/usr/share/opentyrian/data
-	done
+	install -Dt "$pkgdir/usr/share/games/tyrian" -m644 *.dat *.lvl *.shp *.snd \
+		demo.* music.mus tyrend.anm tyrian.{cdt,hdt,pic} tshp2.pcx
 }