aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-04 19:00:00 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:15 +0100
commit0a7ef09c8ad90e0898b6ee2c56f9a27efb1b461a (patch)
tree9b3365ccdcad44e995dfb4d91d5e31ba7d9ddc15
parent6777fac084ebe133b846f8b9228c732dd0a2bec2 (diff)
downloadnx-libs-0a7ef09c8ad90e0898b6ee2c56f9a27efb1b461a.tar.gz
nx-libs-0a7ef09c8ad90e0898b6ee2c56f9a27efb1b461a.tar.bz2
nx-libs-0a7ef09c8ad90e0898b6ee2c56f9a27efb1b461a.zip
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.
-rw-r--r--bin/nxagent.in1
-rw-r--r--nx-X11/config/cf/Imake.tmpl4
-rw-r--r--nx-X11/config/cf/X11.rules4
-rw-r--r--nx-X11/config/cf/lnxLib.rules2
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