aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-07-26 23:19:36 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-08-24 21:24:38 +0200
commit35145c251305a562c4273d712fab5b4b387913ab (patch)
treef35b68947db20d0be46db8f0c27f59590fcb2c84
parent15f943da9b96f485e82ce92ec2673e9b3b2ed58e (diff)
downloadnx-libs-35145c251305a562c4273d712fab5b4b387913ab.tar.gz
nx-libs-35145c251305a562c4273d712fab5b4b387913ab.tar.bz2
nx-libs-35145c251305a562c4273d712fab5b4b387913ab.zip
add XLOCALELIBDIR
-rw-r--r--nx-X11/config/cf/X11.tmpl2
-rw-r--r--nx-X11/lib/X11/Imakefile2
2 files changed, 3 insertions, 1 deletions
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