aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-04 18:54:21 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-09 23:38:11 +0000
commit4c4d3dfba927790abf5af511e8c31200de028a52 (patch)
tree1f0ce9ca60bccac55433d6fa8ba17c99e1ff72a6
parent4a01be659888c4a6a0eeb8396a3521ee759a7e20 (diff)
downloadnx-libs-4c4d3dfba927790abf5af511e8c31200de028a52.tar.gz
nx-libs-4c4d3dfba927790abf5af511e8c31200de028a52.tar.bz2
nx-libs-4c4d3dfba927790abf5af511e8c31200de028a52.zip
Makefile: Actively set/override USRLIBDIR and SHLIBDIR when calling Xserver's make process.
SHLIBDIR -> Points to the system's official library folder. USRLIBDIR -> In NX, this variable (amongst others) is used to set the executables RPATH (if enabled), so pointing this to SHLIBDIR/nx-X11.
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5bdf23b35..14b92219f 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ build-full:
cd nxcompshad && autoconf && (${CONFIGURE}) && ${MAKE}
- cd nx-X11 && ${MAKE} World
+ cd nx-X11 && ${MAKE} World USRLIBDIR=$(USRLIBDIR) SHLIBDIR=$(SHLIBDIR)
cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}