From 35145c251305a562c4273d712fab5b4b387913ab Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Tue, 26 Jul 2016 23:19:36 +0200
Subject: add XLOCALELIBDIR

---
 nx-X11/config/cf/X11.tmpl | 2 ++
 nx-X11/lib/X11/Imakefile  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 2b43ca562..a5b0de7ca 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -1056,6 +1056,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
            XSMDIR = XsmDir		/* xsm config files */
            NLSDIR = NlsDir		/* nls files */
        XLOCALEDIR = XLocaleDir		/* locale files */
+    XLOCALELIBDIR = XlocaleDir          /* FIXME: For now take XLOCALDIR, unsure about the correct setting */
   PROXYMANAGERDIR = ProxyManagerDir	/* proxy manager config files */
       XAPPLOADDIR = XAppLoadDir		/* application default resource dir */
 
@@ -1132,6 +1133,7 @@ VENDORSUPPORTDEFS = VendorSupportDefines
   SYSTEMENVLIBDIR = SystemBuildLibPath
 # endif
 #define XlocaleClientSetup Concat3(XLOCALEDIR,=,BuildI18NDir)
+       Concat3(XLOCALELIBDIR,=,BuildI18NDir)
        XENVLIBDIR = X11BuildLibPath
    CLIENTENVSETUP = Concat3(BuildLibPathVar,=,BuildLibPath) XlocaleClientSetup
 #else
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index eae462391..d5f8026d5 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -170,7 +170,7 @@ EXTRA_LIBRARIES = /**/
 #elif HasGetresuid
   SETID_DEFINES = -DHASGETRESUID
 #endif
-    XLC_DEFINES = -DXLOCALEDIR=\"$(XLOCALEDIR)\"
+    XLC_DEFINES = -DXLOCALEDIR=\"$(XLOCALEDIR)\" -DXLOCALELIBDIR=\"$(XLOCALELIBDIR)\"
 #if (defined(FreeBSDArchitecture) && OSRelVersion < 500016) || \
 	defined(OpenBSDArchitecture)
 THRSTUBSRCS = UIThrStubs.c
-- 
cgit v1.2.3