diff options
author | Donnie Berkholz <spyderous@gentoo.org> | 2005-10-20 22:17:26 +0000 |
---|---|---|
committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-10-20 22:17:26 +0000 |
commit | ee92bd69fbe2b31629a1f9d87d464113ca8f0721 (patch) | |
tree | f1f73673fe9d82fa63f20feb4a6da1ac761ff9b8 | |
parent | 7909f46a7ba31944be57b1574f70da82d8bfd385 (diff) |
Bug #4830 <https://bugs.freedesktop.org/show_bug.cgi?id=4830> Set
DFLT_XKB_CONFIG_ROOT instead of using hard-coded default.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.am | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -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 = \ |