From 2b557a86529c067db89c4d30977f822d82be87c3 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 10 Jul 2012 02:08:38 +0200
Subject: Fix out-of-tree build

* console-client/Makefile (xkb/kstoucs_map.c): Make xkb directory in build
tree.
(CPPFLAGS): Add -I$(CURDIR)/xkb
---
 console-client/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'console-client/Makefile')

diff --git a/console-client/Makefile b/console-client/Makefile
index 8f15e71c..ce8ce353 100644
--- a/console-client/Makefile
+++ b/console-client/Makefile
@@ -41,7 +41,7 @@ LDLIBS = -ldl
 module-dir = $(libdir)/hurd/console
 console-LDFLAGS = -Wl,-E
 
-CPPFLAGS += -I$(srcdir)/xkb
+CPPFLAGS += -I$(CURDIR)/xkb -I$(srcdir)/xkb
 LFLAGS = -i
 YFLAGS = -by
 XKB_DATA_FILES = keymap/hurd types/hurd symbols/hurd
@@ -127,6 +127,7 @@ $(XKB_BASE)/%: xkb/xkb-data/%
 kstoucs.o: xkb/kstoucs_map.c
 kstoucs_pic.o: xkb/kstoucs_map.c
 xkb/kstoucs_map.c: $(X11_KEYSYMDEF_H) $(srcdir)/xkb/kstoucs_map.sh
+	mkdir -p xkb ; \
 	SED=$(SED) \
 	AWK=$(AWK) \
 	sh $(srcdir)/xkb/kstoucs_map.sh \
-- 
cgit v1.2.3