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
committerMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:15 +0100
commit0a7ef09c8ad90e0898b6ee2c56f9a27efb1b461a (patch)
tree9b3365ccdcad44e995dfb4d91d5e31ba7d9ddc15 /nx-X11/config/cf/Imake.tmpl
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.
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