diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-04 22:55:23 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-04 22:55:23 +0200 |
| commit | e0edae04db6dc189512b3a1eda7fe4516af56512 (patch) | |
| tree | 70fb736ed560b4bd430b0ae5799fecbc3961c7e0 /nx-X11/config | |
| parent | 27b0b5723ccbcc92bbcc80dff8fb698b69e74944 (diff) | |
| parent | 1bd2463a2b76340ae356364dff944deba9774cfe (diff) | |
| download | nx-libs-e0edae04db6dc189512b3a1eda7fe4516af56512.tar.gz nx-libs-e0edae04db6dc189512b3a1eda7fe4516af56512.tar.bz2 nx-libs-e0edae04db6dc189512b3a1eda7fe4516af56512.zip | |
Merge branch 'sunweaver-pr/xerrordb-from-xorg' into 3.6.x
Attributes GH PR #164: https://github.com/ArcticaProject/nx-libs/pull/164
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Mon, 04 Jul 2016 13:43:08 -0700
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" */ |