[hurd] 10/43: Revert "Fix taking into account prefix for xkb-data installation"

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit 78ccb233cfed6d9e10864bfdce6348edddada4b8
Author: Samuel Thibault <address@hidden>
Date:   Mon Jun 26 08:34:10 2017 +0200

    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(-)

diff --git a/console-client/Makefile b/console-client/Makefile
index 097db89..024a053 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

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git