aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-04 18:54:21 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:15 +0100
commit14e4005b2cf6438769e56e21584894c7acc31871 (patch)
tree1f4c03ce6d2811ff08d46b2a36b9e067d0230758
parent5d3c4dda7d6ca619ca9893de98b596d48a89281a (diff)
downloadnx-libs-14e4005b2cf6438769e56e21584894c7acc31871.tar.gz
nx-libs-14e4005b2cf6438769e56e21584894c7acc31871.tar.bz2
nx-libs-14e4005b2cf6438769e56e21584894c7acc31871.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}