summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f8ca8be..cdc6ea0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-20 Donnie Berkholz <spyderous@gentoo.org>
+
+ * Makefile.am: Bug #4830 <https://bugs.freedesktop.org/show_bug.cgi?id=4830>
+ Set DFLT_XKB_CONFIG_ROOT instead of using hard-coded default.
+
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/Makefile.am b/Makefile.am
index 74ecbd5..6ad3291 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,9 @@
bin_PROGRAMS = setxkbmap
-setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) -D__XKBDEFRULES__='"xorg"'
+setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) \
+ -D__XKBDEFRULES__='"xorg"' \
+ -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"'
setxkbmap_LDADD = $(SETXKBMAP_LIBS)
setxkbmap_SOURCES = \