diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-07-26 23:19:36 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-10 22:52:29 +0200 |
| commit | ea24f0b0eb7b82ad879810c8e84292d6bf810bea (patch) | |
| tree | 8c8954ae5c13d4ce59bd89251973a2d2cdbfe723 | |
| parent | ef5565f8ed86f05ca20ff1bfc5892fb8a2c557bc (diff) | |
| download | nx-libs-ea24f0b0eb7b82ad879810c8e84292d6bf810bea.tar.gz nx-libs-ea24f0b0eb7b82ad879810c8e84292d6bf810bea.tar.bz2 nx-libs-ea24f0b0eb7b82ad879810c8e84292d6bf810bea.zip | |
add XLOCALELIBDIR
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 2 | ||||
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 4ae57252a..45a383935 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -1053,6 +1053,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 XLOCALEDIR, unsure about the correct setting */ PROXYMANAGERDIR = ProxyManagerDir /* proxy manager config files */ XAPPLOADDIR = XAppLoadDir /* application default resource dir */ @@ -1129,6 +1130,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 |