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 -
 nx-X11/config/cf/Imake.tmpl   | 4 ++--
 nx-X11/config/cf/X11.rules    | 4 ++--
 nx-X11/config/cf/lnxLib.rules | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

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"} "$@"
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 93b659a0d..ba97b3b4c 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -723,12 +723,12 @@ TCLIBDIR = TclLibDir
 
 #ifndef UsrLibDir
 #ifdef ProjectRoot
-#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx)
+#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx/X11)
 #ifndef AlternateUsrLibDir
 #define AlternateUsrLibDir YES
 #endif
 #else
-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx)
+#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11)
 #ifndef AlternateUsrLibDir
 #define AlternateUsrLibDir NO
 #endif
diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules
index 0f6a67ed4..af3473c3a 100644
--- a/nx-X11/config/cf/X11.rules
+++ b/nx-X11/config/cf/X11.rules
@@ -39,9 +39,9 @@
 #endif
 
 #ifdef X11ProjectRoot
-# define XUsrLibDirPath	$(USRLIBDIR)/nx:$(XPROJECTROOT)
+# define XUsrLibDirPath	$(USRLIBDIR):$(XPROJECTROOT)
 #else
-# define XUsrLibDirPath	$(USRLIBDIR)/nx
+# define XUsrLibDirPath	$(USRLIBDIR)
 #endif
 #ifdef UsrLibDirPath
 # undef UsrLibDirPath
diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules
index 166e896f1..e415db8f1 100644
--- a/nx-X11/config/cf/lnxLib.rules
+++ b/nx-X11/config/cf/lnxLib.rules
@@ -9,7 +9,7 @@
 #endif
 
 #ifndef UseRpath
-#define UseRpath NO
+#define UseRpath YES
 #endif
 
 #if UseElfFormat
-- 
cgit v1.2.3