diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-28 20:30:42 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-04 16:39:19 +0200 |
| commit | 1bd2463a2b76340ae356364dff944deba9774cfe (patch) | |
| tree | 70fb736ed560b4bd430b0ae5799fecbc3961c7e0 /nx-X11/config | |
| parent | 27b0b5723ccbcc92bbcc80dff8fb698b69e74944 (diff) | |
| download | nx-libs-1bd2463a2b76340ae356364dff944deba9774cfe.tar.gz nx-libs-1bd2463a2b76340ae356364dff944deba9774cfe.tar.bz2 nx-libs-1bd2463a2b76340ae356364dff944deba9774cfe.zip | |
libNX_X11 data files: Install libNX_X11 related data files.
- Update XErrorDB to latest X.org version.
- Install XErrorDB, XKeysymDB and Xcms.txt to /usr/{local/}share/nx/.
- Assure that libNX_X11 finds those files at the
named location.
- Update debian/ packaging files.
- Update nx-libs.spec packaging file.
Fixes ArcticaProject/nx-libs#153
Diffstat (limited to 'nx-X11/config')
| -rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index d540f418b..b5753b5c7 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -759,6 +759,25 @@ TCLIBDIR = TclLibDir #define AlternateUsrLibDir YES #endif #endif + +#ifndef UsrDataDir +#ifdef ProjectRoot +#define UsrDataDir Concat4(ProjectRoot,/,share,/nx) +#ifndef AlternateUsrDataDir +#define AlternateUsrDataDir YES +#endif +#else +#define UsrDataDir Concat4(/usr/local,/,share,/nx) +#ifndef AlternateUsrDataDir +#define AlternateUsrDataDir NO +#endif +#endif +#else +#ifndef AlternateUsrDataDir +#define AlternateUsrDataDir YES +#endif +#endif + #ifndef VarDirectory #ifdef ProjectVar #define VarDirectory ProjectVar @@ -1656,6 +1675,7 @@ TCLIBDIR = TclLibDir INCROOT = IncRoot /* base of where to put header files */ USRLIBDIR = UsrLibDir /* nonshared libraries */ + USRDATADIR = UsrDataDir /* arch-indep files (XErrorDB, etc.) */ VARDIR = VarDirectory /* usually /var */ VARLIBDIR = VarLibDir /* xdm runtime files */ SYSTEMUSRLIBDIR = SystemUsrLibDir /* system's "/usr/lib" */ |