diff options
| author | Diego Nieto Cid <dnietoc@gmail.com> | 2011-04-12 21:08:04 -0300 |
|---|---|---|
| committer | Diego Nieto Cid <dnietoc@gmail.com> | 2011-04-16 23:45:26 -0300 |
| commit | b2662d9ddb3320fb3ac295c4858efe285fc4168f (patch) | |
| tree | 9fc14fb1de0585b3d134afdd5174b60d99766a07 /console-client/Makefile | |
| parent | 7a0510fa0ccb7a25bef0c2527ff7c570bd60a863 (diff) | |
Use locale's compose file by default.
* console-client/Makefile [HAVE_X11=yes](compose-CFLAGS): Define DATADIR.
* console-client/pc-kbd.c (pc_kbd_init): Load compose file
unconditionally.
* console-client/xkb/compose.c: Include fcntl.h, unistd.h and locale.h
(struct map_entry, enum callback_result, map_callback): New types.
(map_iterate): New function.
(struct matcher_context): New type.
(match_left_set_right, match_right_set_left): New functions.
(get_compose_file_for_locale): Likewise.
(read_composefile): Use get_compose_file_for_locale result when
argument composefn is NULL.
Diffstat (limited to 'console-client/Makefile')
| -rw-r--r-- | console-client/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/console-client/Makefile b/console-client/Makefile index 7629e06a..c84eb7eb 100644 --- a/console-client/Makefile +++ b/console-client/Makefile @@ -118,6 +118,7 @@ XKB_UNITS = $(basename $(notdir $(XKB_SRCS))) pc_kbd.so.$(hurd-version): $(addsuffix _pic.o,$(XKB_UNITS)) pc-kbd-CFLAGS = -DXKB_SUPPORT -DXKB_DATA_DIR=\"$(XKB_BASE)\" $(X11_CFLAGS) $(foreach XKB_UNIT, $(XKB_UNITS), $(eval $(XKB_UNIT)-CFLAGS = $(X11_CFLAGS))) +compose-CFLAGS += -DDATADIR=\"$(datadir)\" pc_kbd-LDLIBS = $(X11_LIBS) install: $(XKB_BASE) $(addprefix $(XKB_BASE)/, $(XKB_DATA_FILES)) |