diff options
| author | Egbert Eich <eich@freedesktop.org> | 2011-05-20 18:25:24 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:26 +0200 |
| commit | 53e2e92e30138f92f04dc5cd25020ee757560d63 (patch) | |
| tree | 338d475b6f6f6d339db50efe2d1b7a67838b8a08 /nx-X11/lib | |
| parent | 11d6dac92b6c3c3f62d49817809ce8c6a61c9293 (diff) | |
| download | nx-libs-53e2e92e30138f92f04dc5cd25020ee757560d63.tar.gz nx-libs-53e2e92e30138f92f04dc5cd25020ee757560d63.tar.bz2 nx-libs-53e2e92e30138f92f04dc5cd25020ee757560d63.zip | |
Don't hard code path to Xcms.txt file.
The path to this file is configurable at build time. The source
however contains a hard coded path.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib')
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/lib/X11/cmsColNm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index af0bcff41..28dcdc1db 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -159,7 +159,7 @@ EXTRA_LIBRARIES = /**/ XF86BIGFONT_DEFINES = XF86BigfontExtensionDefines EDB_DEFINES = -DERRORDB=\"$(USRDATADIR)/XErrorDB\" - CMS_DEFINES = -DXCMSDB=\"$(USRDATADIR)/Xcms.txt\" + CMS_DEFINES = -DXCMSDB=\"$(USRDATADIR)/Xcms.txt\" -DXCMSDIR=\"$(USRDATADIR)\" #if HasSnprintf MISC_DEFINES = -DHAS_SNPRINTF -DLIBX11 #endif diff --git a/nx-X11/lib/X11/cmsColNm.c b/nx-X11/lib/X11/cmsColNm.c index 12f23ce99..4b6739adf 100644 --- a/nx-X11/lib/X11/cmsColNm.c +++ b/nx-X11/lib/X11/cmsColNm.c @@ -54,7 +54,7 @@ static Status LoadColornameDB(void); * #define declarations local to this package. */ #ifndef XCMSDB -#define XCMSDB "/usr/lib/X11/Xcms.txt" +#define XCMSDB XCMSDIR "/Xcms.txt" #endif #ifndef isgraph |