diff options
| author | Luca Weiss <luca@z3ntu.xyz> | 2017-06-19 22:32:30 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-06-19 22:34:13 +0200 |
| commit | a4f5b76390f1c7b377efbac488b57fa6756da80a (patch) | |
| tree | 86de9f221d8833a4c7c98286d984e67e6aaf1274 /console-client | |
| parent | bf1afc9cf958c9270ab73236028097ca0113b176 (diff) | |
Fix taking into account prefix for xkb-data installation
* console-client/Makefile (install): Prepend $(prefix) to install
target.
* console-client/Makefile ($(XKB_BASE)/%): Rename target to
$(prefix)$(XKB_BASE)/%.
Diffstat (limited to 'console-client')
| -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 024a053d..097db89e 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) $(addprefix $(XKB_BASE)/, $(XKB_DATA_FILES)) +install: $(XKB_BASE) $(prefix)$(addprefix $(XKB_BASE)/, $(XKB_DATA_FILES)) $(XKB_BASE): @$(MKINSTALLDIRS) $@ -$(XKB_BASE)/%: xkb/xkb-data/% +$(prefix)$(XKB_BASE)/%: xkb/xkb-data/% $(INSTALL_DATA) $< $@ kstoucs.o: xkb/kstoucs_map.c |