From c45cab1ba5a6ffe3832039d89c26a6d11068d417 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 4 Feb 2017 18:52:04 +0100
Subject: Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) with
 nx-X11 internal naming schemes (and use /usr/<lib>/nx/X11 rather than
 /usr/<lib>/nx-X11).

---
 bin/nxagent.in | 6 +++---
 bin/nxproxy.in | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/nxagent.in b/bin/nxagent.in
index 86603d549..b3e87aab1 100644
--- a/bin/nxagent.in
+++ b/bin/nxagent.in
@@ -15,11 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
-NX_LIBS=@@NXLIBDIR@@
+NX_LIBDIR=@@NXLIBDIR@@
 
 # make sure nxagent starts properly with pam_tmpdir.so being in use
 NX_TEMP=${NX_TEMP:-/tmp}
 export NX_TEMP
-export LD_LIBRARY_PATH=@@NXLIBDIR@@-X11/
+export LD_LIBRARY_PATH=@@NX_LIBDIR@@/X11/
 
-exec $NX_LIBS/bin/${NXAPP:-"nxagent"} "$@"
+exec $NX_LIBDIR/bin/${NXAPP:-"nxagent"} "$@"
diff --git a/bin/nxproxy.in b/bin/nxproxy.in
index d21388d18..0866d25ac 100644
--- a/bin/nxproxy.in
+++ b/bin/nxproxy.in
@@ -15,10 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
-NX_LIBS=@@NXLIBDIR@@
+NX_LIBDIR=@@NXLIBDIR@@
 
 # make sure nxagent starts properly with pam_tmpdir.so being in use
 NX_TEMP=${NX_TEMP:-/tmp}
 export NX_TEMP
 
-exec $NX_LIBS/bin/${NXAPP:="nxproxy"} "$@"
+exec $NX_LIBDIR/bin/${NXAPP:="nxproxy"} "$@"
-- 
cgit v1.2.3


From ba620a054a7a9dfebc040a4f3cbf27c9e9ffe4b0 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 4 Feb 2017 19:00:00 +0100
Subject: Load libNX_X11 / faked libX11 via RPATH setting rather than fidgeting
 with LD_LIBRARY_PATH in the nxagent wrapper script.

 Fixes ArcticaProject/nx-libs#225.
---
 bin/nxagent.in | 1 -
 1 file changed, 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nxagent.in b/bin/nxagent.in
index b3e87aab1..3a9dfc649 100644
--- a/bin/nxagent.in
+++ b/bin/nxagent.in
@@ -20,6 +20,5 @@ NX_LIBDIR=@@NXLIBDIR@@
 # make sure nxagent starts properly with pam_tmpdir.so being in use
 NX_TEMP=${NX_TEMP:-/tmp}
 export NX_TEMP
-export LD_LIBRARY_PATH=@@NX_LIBDIR@@/X11/
 
 exec $NX_LIBDIR/bin/${NXAPP:-"nxagent"} "$@"
-- 
cgit v1.2.3