From 4bc57febda9233296054ec5defca4f142ccf8106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 27 Jan 2020 14:12:19 +0100 Subject: [PATCH] warsow: install in usr/lib/warsow --- srcpkgs/warsow/files/warsow.launcher | 2 +- srcpkgs/warsow/files/wsw-server.launcher | 2 +- srcpkgs/warsow/files/wswtv-server.launcher | 2 +- srcpkgs/warsow/template | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/warsow/files/warsow.launcher b/srcpkgs/warsow/files/warsow.launcher index 5b14a278920..fdc564d8227 100644 --- a/srcpkgs/warsow/files/warsow.launcher +++ b/srcpkgs/warsow/files/warsow.launcher @@ -1,5 +1,5 @@ #!/bin/sh -cd /usr/share/warsow +cd /usr/lib/warsow ./warsow $* exit $? diff --git a/srcpkgs/warsow/files/wsw-server.launcher b/srcpkgs/warsow/files/wsw-server.launcher index 42f604ab5a5..21a2fc6407d 100644 --- a/srcpkgs/warsow/files/wsw-server.launcher +++ b/srcpkgs/warsow/files/wsw-server.launcher @@ -1,5 +1,5 @@ #!/bin/sh -cd /usr/share/warsow +cd /usr/lib/warsow ./wsw_server $* exit $? diff --git a/srcpkgs/warsow/files/wswtv-server.launcher b/srcpkgs/warsow/files/wswtv-server.launcher index 6f17f98a81d..ba4cc3e8b68 100644 --- a/srcpkgs/warsow/files/wswtv-server.launcher +++ b/srcpkgs/warsow/files/wswtv-server.launcher @@ -1,5 +1,5 @@ #!/bin/sh -cd /usr/share/warsow +cd /usr/lib/warsow ./wswtv_server $* exit $? diff --git a/srcpkgs/warsow/template b/srcpkgs/warsow/template index 091272907e6..be53257c343 100644 --- a/srcpkgs/warsow/template +++ b/srcpkgs/warsow/template @@ -1,7 +1,7 @@ # Template file for 'warsow' pkgname=warsow version=2.1 -revision=1 +revision=2 build_style=cmake configure_args="-DQFUSION_GAME=Warsow" wrksrc="warsow_${version/./}_sdk" @@ -23,18 +23,18 @@ archs="i686* x86_64*" do_install() { # Move Compiled Data to Destination Directory - vmkdir usr/share/warsow + vmkdir usr/lib/warsow case "$XBPS_TARGET_MACHINE" in x86_64*) _arch=x86_64 ;; i686*) _arch=i686 ;; esac - vinstall "build/warsow.$_arch" 0755 /usr/share/warsow warsow - vinstall "build/wsw_server.$_arch" 0755 /usr/share/warsow wsw_server - vinstall "build/wswtv_server.$_arch" 0755 /usr/share/warsow wswtv_server - vcopy "build/basewsw" usr/share/warsow - vcopy "build/libs" usr/share/warsow + vinstall "build/warsow.$_arch" 0755 /usr/lib/warsow warsow + vinstall "build/wsw_server.$_arch" 0755 /usr/lib/warsow wsw_server + vinstall "build/wswtv_server.$_arch" 0755 /usr/lib/warsow wswtv_server + vcopy "build/basewsw" usr/lib/warsow + vcopy "build/libs" usr/lib/warsow vbin ${FILESDIR}/warsow.launcher warsow vbin ${FILESDIR}/wsw-server.launcher wsw-server