aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf/Imake.tmpl
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-04 19:00:00 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-09 23:39:25 +0000
commitba620a054a7a9dfebc040a4f3cbf27c9e9ffe4b0 (patch)
tree899ba0816d1a86bfcff3e28fe425386f96e4a219 /nx-X11/config/cf/Imake.tmpl
parent9d1da072c5f44e33d071a7f4f7c8c436cc8494fd (diff)
downloadnx-libs-ba620a054a7a9dfebc040a4f3cbf27c9e9ffe4b0.tar.gz
nx-libs-ba620a054a7a9dfebc040a4f3cbf27c9e9ffe4b0.tar.bz2
nx-libs-ba620a054a7a9dfebc040a4f3cbf27c9e9ffe4b0.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.
Diffstat (limited to 'nx-X11/config/cf/Imake.tmpl')
-rw-r--r--nx-X11/config/cf/Imake.tmpl4
1 files changed, 2 insertions, 2 deletions
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