diff options
| author | Egbert Eich <eich@freedesktop.org> | 2011-05-20 18:25:24 +0200 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2013-01-03 10:35:43 -0500 |
| commit | 51fef7e273b5c6256e4c9604e3e1afe5dc8f6a1a (patch) | |
| tree | 7afdf6f2223d4b3c6092becaff335ad16d9a79dd | |
| parent | 9833489e6c3829a1e835bc0a11f028fc180809e4 (diff) | |
| download | xorg-lib-libX11-51fef7e273b5c6256e4c9604e3e1afe5dc8f6a1a.tar.gz | |
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>
| -rw-r--r-- | src/xcms/Makefile.am | 3 | ||||
| -rw-r--r-- | 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 40212c01..c6bc8e54 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 8518adfd..73977e5f 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 |