diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-06-26 08:34:10 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-06-26 08:34:55 +0200 |
| commit | 78ccb233cfed6d9e10864bfdce6348edddada4b8 (patch) | |
| tree | 6c49ace9662131cbb9afcd9ca683fa33747705fc | |
| parent | 7a03aea10fd581c41d27acc1a29f7b10b09920cc (diff) | |
| download | hurd-78ccb233cfed6d9e10864bfdce6348edddada4b8.tar.gz hurd-78ccb233cfed6d9e10864bfdce6348edddada4b8.tar.bz2 hurd-78ccb233cfed6d9e10864bfdce6348edddada4b8.zip | |
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.
| -rw-r--r-- | console-client/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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 |