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/lib/X11/Imakefile | |
| 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/lib/X11/Imakefile')
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index cc87d6e7b..186cd963d 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -152,9 +152,9 @@ EXTRA_LIBRARIES = /**/ XF86BIGFONT_DEFINES = XF86BigfontExtensionDefines - EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/XErrorDB\" - KDB_DEFINES = -DKEYSYMDB=\"$(LIBDIR)/XKeysymDB\" - CMS_DEFINES = -DXCMSDB=\"$(LIBDIR)/Xcms.txt\" + EDB_DEFINES = -DERRORDB=\"$(USRDATADIR)/XErrorDB\" + KDB_DEFINES = -DKEYSYMDB=\"$(USRDATADIR)/XKeysymDB\" + CMS_DEFINES = -DXCMSDB=\"$(USRDATADIR)/Xcms.txt\" #if HasSnprintf MISC_DEFINES = -DHAS_SNPRINTF -DLIBX11 #endif |