From 1e1f1246bb8edc343320f91b8f5edd024bf801b6 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 4 Feb 2017 18:52:04 +0100
Subject: Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) with
 nx-X11 internal naming schemes (and use /usr/<lib>/nx/X11 rather than
 /usr/<lib>/nx-X11).

---
 bin/nxagent.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin/nxagent.in')

diff --git a/bin/nxagent.in b/bin/nxagent.in
index 86603d549..b3e87aab1 100644
--- a/bin/nxagent.in
+++ b/bin/nxagent.in
@@ -15,11 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
-NX_LIBS=@@NXLIBDIR@@
+NX_LIBDIR=@@NXLIBDIR@@
 
 # make sure nxagent starts properly with pam_tmpdir.so being in use
 NX_TEMP=${NX_TEMP:-/tmp}
 export NX_TEMP
-export LD_LIBRARY_PATH=@@NXLIBDIR@@-X11/
+export LD_LIBRARY_PATH=@@NX_LIBDIR@@/X11/
 
-exec $NX_LIBS/bin/${NXAPP:-"nxagent"} "$@"
+exec $NX_LIBDIR/bin/${NXAPP:-"nxagent"} "$@"
-- 
cgit v1.2.3