Cleaned up installation process. Change hardcoded datapath in binaries to /usr prefix

4 files changed, 5 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27521e4f9902..eba90841ee5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = alienarena-svn
 	pkgdesc = Multiplayer retro sci-fi deathmatch game based on Quake2
 	pkgver = r5655
-	pkgrel = 1
+	pkgrel = 2
 	url = http://icculus.org/alienarena/rpa/
 	arch = i686
 	arch = x86_64
@@ -20,12 +20,8 @@ pkgbase = alienarena-svn
 	conflicts = alienarena
 	source = svn://svn.icculus.org/alienarena/trunk#revision=5655
 	source = alienarena.desktop
-	source = alienarena
-	source = alienarena-ded
 	sha512sums = SKIP
 	sha512sums = 4ceb9b838f689aa0b60cfb761411f1708ed852970cd62b218fd42d33db7d59c003ee52fcbb39cfe3d150e15d887696f26e9dadf60e4c4fca97c5d574a47f1402
-	sha512sums = 9ae4e20628f371c9135aed884247b7929c5d8143f01962a82adc1d8acbfe9999c7684b6a262bad7b6300c95a2efe22eac065db2679694985ba70bcf9d8b6cf55
-	sha512sums = 09f1313975e7891844dccc35b8c38af4f25295a9a5fd4f92379266a0b0c507f63c25546ff0b5a8dfe36a6142f09782ed629f1f5f14193bf8e5e5841aac02d96c
 
 pkgname = alienarena-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index 76a26cb102e0..8eb7e7c00959 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=alienarena-svn
 pkgver=r5655
-pkgrel=1
+pkgrel=2
 pkgdesc="Multiplayer retro sci-fi deathmatch game based on Quake2"
 arch=('i686' 'x86_64')
 url="http://icculus.org/alienarena/rpa/"
@@ -18,20 +18,12 @@ conflicts=('alienarena')
 source=(
   svn://svn.icculus.org/alienarena/trunk#revision=5655
   'alienarena.desktop'
-  'alienarena'
-  'alienarena-ded'
 )
 sha512sums=(
   'SKIP'
   "4ceb9b838f689aa0b60cfb761411f1708ed852970cd62b218fd42d33db7d59c003ee52fcbb39cfe3d150e15d887696f26e9dadf60e4c4fca97c5d574a47f1402"
-  "9ae4e20628f371c9135aed884247b7929c5d8143f01962a82adc1d8acbfe9999c7684b6a262bad7b6300c95a2efe22eac065db2679694985ba70bcf9d8b6cf55"
-  "09f1313975e7891844dccc35b8c38af4f25295a9a5fd4f92379266a0b0c507f63c25546ff0b5a8dfe36a6142f09782ed629f1f5f14193bf8e5e5841aac02d96c"
 )
 
-# View at https://svn.icculus.org/alienarena/trunk/
-_datadir="/usr/share/${pkgname}"
-_libdir="/usr/lib/${pkgname}"
-
 pkgver() {
   cd trunk/
   local ver="$(svnversion)"
@@ -42,9 +34,10 @@ build() {
 
 	cd trunk/
 
-	./configure
+	./configure --prefix=/usr
 
-	make PREFIX=/usr
+	export CPPFLAGS=" -DDATADIR='/usr/share/alienarena'"
+	make
 }
 
  package() {
@@ -52,13 +45,5 @@ build() {
 
 	make DESTDIR=$pkgdir install
 
-	mv $pkgdir/usr/local/share $pkgdir/usr/share
-	mv $pkgdir/usr/local/bin/alienarena $pkgdir/usr/share/alienarena
-	mv $pkgdir/usr/local/bin/alienarena-ded $pkgdir/usr/share/alienarena
-	rmdir $pkgdir/usr/local/bin
-	rmdir $pkgdir/usr/local
-
 	install -D -m755 $srcdir/alienarena.desktop $pkgdir/usr/share/applications/alienarena.desktop
-	install -D -m755 $srcdir/alienarena $pkgdir/usr/bin/alienarena
-	install -D -m755 $srcdir/alienarena-ded $pkgdir/usr/bin/alienarena-ded
 }
diff --git a/alienarena b/alienarena
deleted file mode 100755
index afeddb09c88b..000000000000
--- a/alienarena
+++ /dev/null
@@ -1,3 +0,0 @@
-#/bin/bash
-cd /usr/share/alienarena
-./alienarena "$@"
diff --git a/alienarena-ded b/alienarena-ded
deleted file mode 100755
index d6aac4cffc77..000000000000
--- a/alienarena-ded
+++ /dev/null
@@ -1,3 +0,0 @@
-#/bin/bash
-cd /usr/share/alienarena
-./alienarena-ded "$@"