From 78ccb233cfed6d9e10864bfdce6348edddada4b8 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 26 Jun 2017 08:34:10 +0200
Subject: Revert "Fix taking into account prefix for xkb-data installation"

This reverts commit a4f5b76390f1c7b377efbac488b57fa6756da80a.
This broke existing configurations (Debian and Guix), more investigation
seems to be needed for Arch.
---
 console-client/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'console-client')

diff --git a/console-client/Makefile b/console-client/Makefile
index 097db89e..024a053d 100644
--- a/console-client/Makefile
+++ b/console-client/Makefile
@@ -112,12 +112,12 @@ 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) $(prefix)$(addprefix $(XKB_BASE)/, $(XKB_DATA_FILES))
+install: $(XKB_BASE) $(addprefix $(XKB_BASE)/, $(XKB_DATA_FILES))
 
 $(XKB_BASE):
 	@$(MKINSTALLDIRS) $@
 
-$(prefix)$(XKB_BASE)/%: xkb/xkb-data/%
+$(XKB_BASE)/%: xkb/xkb-data/%
 	$(INSTALL_DATA) $< $@
 
 kstoucs.o: xkb/kstoucs_map.c
-- 
cgit v1.2.3