summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--console-client/Makefile15
1 files changed, 12 insertions, 3 deletions
diff --git a/console-client/Makefile b/console-client/Makefile
index b7f3763d..f4c8f7a3 100644
--- a/console-client/Makefile
+++ b/console-client/Makefile
@@ -51,13 +51,15 @@ console-LDFLAGS = -Wl,-E
CPPFLAGS += -I$(srcdir)/xkb
LFLAGS = -i
YFLAGS = -by
+XKB_DATA_DIR = $(datadir)/X11/xkb
+XKB_DATA_FILES = keymap/hurd types/hurd symbols/hurd
# In seeking, thou shalt find it!
CPPFLAGS += -DQUAERENDO_INVENIETIS
DIST_FILES = xkb/HACKING xkb/MISSING-FEATURES xkb/README xkb/TODO \
xkb/Compose xkb/default.xkb xkb/makeconf.sh \
- $(wildcard xkb/xkb-data/*/hurd)
+ $(addprefix xkb/xkb-data/, $(XKB_DATA_FILES))
include ../Makeconf
@@ -72,7 +74,7 @@ console: $(CONSOLE_SRCS:.c=.o) \
modules = vga pc_kbd generic_speaker pc_mouse current_vcs
vga-CPPFLAGS = -DDEFAULT_VGA_FONT_DIR=\"${datadir}/hurd/\"
-pc-kbd-CFLAGS = -DXKB_SUPPORT -DXKB_DATA_DIR=\"$(datadir)/X11/xkb\"
+pc-kbd-CFLAGS = -DXKB_SUPPORT -DXKB_DATA_DIR=\"$(XKB_DATA_DIR)\"
vga.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(VGA_SO_SRCS))
pc_kbd.so.$(hurd-version): $(addsuffix _pic.o, $(basename $(notdir $(PC_KBD_SO_SRCS)))) \
kdioctlServer_pic.o
@@ -91,7 +93,8 @@ all: $(addsuffix .so.$(hurd-version), $(modules))
cleantarg += $(addsuffix .so.$(hurd-version), $(modules))
-install: $(module-dir) $(addprefix $(module-dir)/,$(addsuffix .so.$(hurd-version),$(modules)))
+install: $(module-dir) $(addprefix $(module-dir)/,$(addsuffix .so.$(hurd-version),$(modules))) \
+ $(XKB_DATA_DIR) $(addprefix $(XKB_DATA_DIR)/, $(XKB_DATA_FILES))
$(module-dir):
@$(MKINSTALLDIRS) $@
@@ -99,6 +102,12 @@ $(module-dir):
$(module-dir)/%: %
$(INSTALL_DATA) $< $@
+$(XKB_DATA_DIR):
+ @$(MKINSTALLDIRS) $@
+
+$(XKB_DATA_DIR)/%: xkb/xkb-data/%
+ $(INSTALL_DATA) $< $@
+
# You can use this rule to make a dynamically-loadable version of any
# of the modules.
%.so.$(hurd-version):