From 5934d03efdcf32e8ecdf61cc29a80b2088e6de9c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 30 Jun 2016 23:50:12 +0200 Subject: Rework nxagent and nxproxy wrapper scripts. o Install nxagent/nxproxy executables into multi-arch path. o Fake libNX_X11.so* as $LIBDIR/nx-X11/libX11.so*. o Allow injecting different $NXAPP containing the executable name. o For e.g. x2goagent this requires the following changes: - Move x2goagent symlink from /usr/lib/x2go/bin/x2goagent to $LIBDIR/nx/bin/x2goagent - Replace /usr/bin/x2goagent by a two-liner... ``` #!/bin/sh export NXAPP=x2goagent nxagent ``` --- debian/nxagent.install | 3 ++- debian/nxproxy.install | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/nxagent.install b/debian/nxagent.install index 123971a7c..75e72fcde 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -3,7 +3,8 @@ etc/nxagent/rgb usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* -usr/lib/nx/bin/nxagent +usr/lib/*/nx/bin/nxagent +usr/lib/*/nx-X11/ usr/bin/nxagent usr/share/pixmaps/nxagent.xpm etc/nxagent/nxagent.keyboard diff --git a/debian/nxproxy.install b/debian/nxproxy.install index ab7c97d58..8ade77d6d 100644 --- a/debian/nxproxy.install +++ b/debian/nxproxy.install @@ -1,4 +1,4 @@ -usr/lib/nx/bin/nxproxy +usr/lib/*/nx/bin/nxproxy usr/bin/nxproxy usr/share/man/man1/nxproxy.1* usr/share/nx/VERSION.nxproxy -- cgit v1.2.3