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>

Don't hard code path to Xcms.txt file.
53e2e92e · Egbert Eich · Ulrich Sibiller · 11d6dac9 · 53e2e92e · 53e2e92e
Commit 53e2e92e authored May 20, 2011 by Egbert Eich Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Imakefile nx-X11/lib/X11/Imakefile +1 -1

cmsColNm.c nx-X11/lib/X11/cmsColNm.c +1 -1

No files found.
--- 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

--- 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