aboutsummaryrefslogtreecommitdiff
path: root/libX11/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-07 12:17:07 +0100
committermarha <marha@users.sourceforge.net>2013-01-07 12:17:07 +0100
commit0e950715b62dcf30ffbf69831bf932fd348537e5 (patch)
tree83fdafc455e9906f029e2e1ad926fb35c98e7be9 /libX11/src
parent506537495e6d808f219361a5b270510c752e7a2e (diff)
parent3f553aaceddc9b09363c73d9bea40eaea8164fc4 (diff)
downloadvcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.gz
vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.bz2
vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.zip
Merge remote-tracking branch 'origin/released'
* origin/released: pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013 Conflicts: fontconfig/src/fcatomic.c pixman/pixman/pixman-mmx.c pixman/pixman/pixman-sse2.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/wincursor.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/xfixes/cursor.c
Diffstat (limited to 'libX11/src')
-rw-r--r--libX11/src/xcms/Makefile.am5
-rw-r--r--libX11/src/xcms/cmsColNm.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/libX11/src/xcms/Makefile.am b/libX11/src/xcms/Makefile.am
index 40212c01b..d147e23bf 100644
--- a/libX11/src/xcms/Makefile.am
+++ b/libX11/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) \
@@ -84,7 +85,7 @@ libxcms_la_SOURCES = \
xyY.c \
Xcmsint.h
-X11dir = $(libdir)/X11
+X11dir = $(X11_DATADIR)
dist_X11_DATA = Xcms.txt
diff --git a/libX11/src/xcms/cmsColNm.c b/libX11/src/xcms/cmsColNm.c
index 8518adfd1..73977e5fc 100644
--- a/libX11/src/xcms/cmsColNm.c
+++ b/libX11/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