[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 10/43: Revert "Fix taking into account prefix for xkb-data instal
From: |
Samuel Thibault |
Subject: |
[hurd] 10/43: Revert "Fix taking into account prefix for xkb-data installation" |
Date: |
Mon, 11 Sep 2017 07:10:09 +0000 |
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
- [hurd] branch upstream updated (cb991b0 -> 796f878), Samuel Thibault, 2017/09/11
- [hurd] 04/43: hurd: Fix the use of polymorphic types., Samuel Thibault, 2017/09/11
- [hurd] 07/43: Fix taking into account prefix for xkb-data installation, Samuel Thibault, 2017/09/11
- [hurd] 06/43: trans: Fix parallel build race around MIG-generated headers, Samuel Thibault, 2017/09/11
- [hurd] 09/43: libshouldbeinlibc: Add missing include., Samuel Thibault, 2017/09/11
- [hurd] 05/43: ext2fs: Reduce verbosity of missing xattr support on the FS, Samuel Thibault, 2017/09/11
- [hurd] 11/43: build: Drop unused/unsubstituted config variables, Samuel Thibault, 2017/09/11
- [hurd] 10/43: Revert "Fix taking into account prefix for xkb-data installation",
Samuel Thibault <=
- [hurd] 19/43: libdiskfs: Make mapping the time device more robust., Samuel Thibault, 2017/09/11
- [hurd] 01/43: procfs: Remove superfluous calls., Samuel Thibault, 2017/09/11
- [hurd] 13/43: Fix harmless indentation errors tripping [-Wmisleading-indentation]., Samuel Thibault, 2017/09/11
- [hurd] 22/43: libshouldbeinlibc: Fix wiring code., Samuel Thibault, 2017/09/11
- [hurd] 27/43: eth-multiplexer: Generalize function and improve error handling., Samuel Thibault, 2017/09/11
- [hurd] 32/43: eth-multiplexer: Fix type check., Samuel Thibault, 2017/09/11
- [hurd] 38/43: trans/mtab: Fix warnings., Samuel Thibault, 2017/09/11
- [hurd] 41/43: exec: Avoid calling mmap with zero size, Samuel Thibault, 2017/09/11
- [hurd] 24/43: eth-multiplexer: Fix error handling., Samuel Thibault, 2017/09/11
- [hurd] 12/43: Fix typo., Samuel Thibault, 2017/09/11