commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Samuel Thibault
Subject: [hurd] 07/43: 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 a4f5b76390f1c7b377efbac488b57fa6756da80a
Author: Luca Weiss <address@hidden>
Date:   Mon Jun 19 22:32:30 2017 +0200

    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)/%.
---
 console-client/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]