summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2005-09-01 19:37:02 +0000
committerKristian Høgsberg <krh@redhat.com>2005-09-01 19:37:02 +0000
commit8c0d310c1acccc424dae29554a5075f9b339e95f (patch)
treec962cf52144912eb5060c3538c192eabd44ca13e
parentfabda6a820bdccae85a7c22ad0b30f089952606b (diff)
Define DFLT_XKB_CONFIG_ROOT to $(datadir)/X11/xkb so we look in the right
place.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35025c5..6852738 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-01 Kristian Høgsberg <krh@redhat.com>
+
+ * Makefile.am (AM_CFLAGS): Define DFLT_XKB_CONFIG_ROOT to
+ $(datadir)/X11/xkb so we look in the right place.
+
2005-08-02 Keith Packard <keithp@keithp.com>
* Makefile.am:
diff --git a/Makefile.am b/Makefile.am
index 1fc999f..e9aec03 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xkbcomp
-AM_CFLAGS = $(XKBCOMP_CFLAGS)
+AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"'
xkbcomp_LDADD = $(XKBCOMP_LIBS)
xkbcomp_SOURCES = \