summaryrefslogtreecommitdiff
path: root/testing/nx/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'testing/nx/PKGBUILD')
-rw-r--r--testing/nx/PKGBUILD26
1 files changed, 17 insertions, 9 deletions
diff --git a/testing/nx/PKGBUILD b/testing/nx/PKGBUILD
index 6db55bcd4..4cf19311a 100644
--- a/testing/nx/PKGBUILD
+++ b/testing/nx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156624 2012-04-21 23:25:48Z andyrtr $
+# $Id: PKGBUILD 156665 2012-04-22 17:10:42Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=nx
pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
pkgver=3.5.0.12
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://wiki.x2go.org/"
license=('GPL')
@@ -41,8 +41,11 @@ package_nxproxy() {
pkgdesc="NX proxy"
depends=('libxcomp')
- install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx}
- cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx
+ install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
+ cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin
+ cd ${pkgdir}/usr/lib/nx
+ ln -sv /usr/lib/nx/bin/nxproxy .
+
# the wrapper
cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
chmod +x ${pkgdir}/usr/bin/nxproxy
@@ -55,7 +58,6 @@ package_nx-xcompext() {
depends=('libxcomp' 'nx-x11')
install -dm755 ${pkgdir}/usr/lib/nx
- #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx
cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx
cd ${pkgdir}/usr/lib/nx
ln -sv libXcompext.so.3.5.0 libXcompext.so.3
@@ -69,10 +71,13 @@ package_nx-x11() {
pkgdesc="NX-X11 lib for the NX framework"
depends=('libxcomp')
- install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
+ install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin}
cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
- cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx
+ cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin
+ cd ${pkgdir}/usr/lib/nx
+ ln -sv /usr/lib/nx/bin/nxauth .
+
# the wrapper
cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
chmod +x ${pkgdir}/usr/bin/nxauth
@@ -85,8 +90,11 @@ package_nxagent() {
pkgdesc="NX X server based on Xnest"
depends=('nx-xcompext')
- install -dm755 ${pkgdir}/usr/{bin,lib/nx}
- cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
+ install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin}
+ cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin
+ cd ${pkgdir}/usr/lib/nx
+ ln -sv /usr/lib/nx/bin/nxagent .
+
# the wrapper
cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
chmod +x ${pkgdir}/usr/bin/nxagent