[PATCH libX11 1/2] Don't hard code path to Xcms.txt file.

[Egbert Eich]

The path to this file is configurable at build time. The source
however contains a hard coded path.

Signed-off-by: Egbert Eich <eich at freedesktop.org>
---
 src/xcms/Makefile.am |    3 ++-
 src/xcms/cmsColNm.c  |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/xcms/Makefile.am b/src/xcms/Makefile.am
index 40212c0..c6bc8e5 100644
--- a/src/xcms/Makefile.am
+++ b/src/xcms/Makefile.am
@@ -9,7 +9,8 @@ AM_CPPFLAGS= \
 	-I$(top_srcdir)/src/xkb \
 	-I$(top_srcdir)/src/xlibi18n \
 	-I$(top_srcdir)/src \
-	-D_BSD_SOURCE
+	-D_BSD_SOURCE \
+        -DXCMSDIR=\"$(X11dir)\"
 
 AM_CFLAGS= \
 	$(X11_CFLAGS) \
diff --git a/src/xcms/cmsColNm.c b/src/xcms/cmsColNm.c
index 8518adf..73977e5 100644
--- a/src/xcms/cmsColNm.c
+++ b/src/xcms/cmsColNm.c
@@ -53,7 +53,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
-- 
1.7.7