From 4c4d3dfba927790abf5af511e8c31200de028a52 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 4 Feb 2017 18:54:21 +0100
Subject: 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.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

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}
 
-- 
cgit v1.2.3