Moved game files to /usr/share/games/quake/

Removed -j1restriction 
Cleaned up unneeded lines

3 files changed, 16 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12ed440a2e24..091b564b6f83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = darkplaces-xonotic
 	pkgdesc = An advanced Quake 1 game engine (Xonotic branch)
 	pkgver = 0.8.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://icculus.org/twilight/darkplaces/
 	install = darkplaces-xonotic.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 12f5c83ee544..59daf33ca6c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=darkplaces-xonotic
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced Quake 1 game engine (Xonotic branch)"
 arch=('i686' 'x86_64')
 url="http://icculus.org/twilight/darkplaces/"
@@ -21,23 +21,17 @@ sha256sums=('61c2225e7a740af3111e4ebb260d7aceddd7e1f3e632b39f6dae22150097c431'
             '476f513f85da873ce93c89f2078bf9c2ea244e3e13a19c6ab02e818ddf221c37')
 
 build() {
-  # Extract the package
   cd "${srcdir}/${pkgname}-v${pkgver}"
 
-  # Make sure Darkplaces is not compiled with -j > 1.
-  MAKEFLAGS="${MAKEFLAGS} -j1"
-
   # Compile
-  sed -i -e '1i DP_LINK_TO_LIBJPEG=1' makefile
-  #make OPTIM_RELEASE="${CFLAGS}" DP_FS_BASEDIR=/usr/share/quake release || return 1
-  make OPTIM_RELEASE="${CFLAGS}" DP_FS_BASEDIR=/usr/share/quake cl-release
-  make OPTIM_RELEASE="${CFLAGS}" DP_FS_BASEDIR=/usr/share/quake sdl2-release
-  make OPTIM_RELEASE="${CFLAGS}" DP_FS_BASEDIR=/usr/share/quake sv-release
+  make OPTIM_RELEASE="${CFLAGS}" DP_FS_BASEDIR=/usr/share/games/quake DP_LINK_TO_LIBJPEG=1 cl-release
+  make OPTIM_RELEASE="${CFLAGS}" DP_FS_BASEDIR=/usr/share/games/quake DP_LINK_TO_LIBJPEG=1 sdl2-release
+  make OPTIM_RELEASE="${CFLAGS}" DP_FS_BASEDIR=/usr/share/games/quake DP_LINK_TO_LIBJPEG=1 sv-release
 }
 
 package() {
   cd "${srcdir}/${pkgname}-v${pkgver}"
-  install -d $pkgdir/usr/{bin,share/quake}
+  install -d $pkgdir/usr/{bin,share/games/quake}
   install -m755 darkplaces-{dedicated,glx,sdl} $pkgdir/usr/bin
 
   for i in 16 24 32 48 64 72; do
diff --git a/darkplaces-xonotic.install b/darkplaces-xonotic.install
index 17f88a712581..78f12fba5847 100644
--- a/darkplaces-xonotic.install
+++ b/darkplaces-xonotic.install
@@ -1,14 +1,15 @@
 post_install() {
-  echo ">>> You need the Quake 1 data to play."
-  echo ">>> Copy your \"id1\" directory to /usr/share/quake"
-  post_upgrade
+  cat <<EOF
+You need the Quake 1 data files to play.
+Copy the "id1" directory to /usr/share/games/quake
+EOF
 }
 
 post_upgrade() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  if [ "$(vercmp "$1" 0.8.1-1)" -eq 1 ]; then
+    cat <<EOF
+The Quake data directory has changed to /usr/share/games/quake
+You may need to move or link your current data from /usr/share/quake
+EOF
+  fi
 }
-
-post_remove() {
-  post_upgrade
-}
\ No newline at end of file