From 53e2e92e30138f92f04dc5cd25020ee757560d63 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 20 May 2011 18:25:24 +0200 Subject: 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 Reviewed-by: Alan Coopersmith Backported-to-NX-by: Ulrich Sibiller --- nx-X11/lib/X11/Imakefile | 2 +- nx-X11/lib/X11/cmsColNm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/lib') 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 -- cgit v1.2.3