From d2fb122c2f32a8780f2e02e1bb28538e99ee7780 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Sat, 6 Jun 2009 19:43:22 +0000
Subject: [PATCH] correct install targets, build of compat scripts in depend
 stage.

---
 data/xkeyboard-config/rules/Makefile | 75 +++++++++++++++-------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/data/xkeyboard-config/rules/Makefile b/data/xkeyboard-config/rules/Makefile
index 2244967dd..7f70d4e79 100644
--- a/data/xkeyboard-config/rules/Makefile
+++ b/data/xkeyboard-config/rules/Makefile
@@ -1,49 +1,51 @@
-#	$OpenBSD: Makefile,v 1.1.1.1 2009/06/06 17:55:01 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.2 2009/06/06 19:43:22 matthieu Exp $
 
 SUBDIR=	compat
 
 XKB_SUBDIR=	rules
 
-DATA=	base base.lst base.xml xkb.dtd README
+DATA=	xkb.dtd README
 
 base_parts = base.hdr.part base.lists.part \
-compat/base.lists.part \
-HDR base.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR base.o_k.part \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR compat/base.mlv_s.part base.mlv_s.part \
-HDR compat/base.ml_s.part base.ml_s.part  \
-HDR compat/base.ml1_s.part base.ml1_s.part \
-HDR compat/base.ml1v1_s.part \
-HDR compat/base.l2_s.part base.l2_s.part  \
-HDR compat/base.l3_s.part base.l3_s.part  \
-HDR compat/base.l4_s.part base.l4_s.part  \
-HDR compat/base.l2v2_s.part \
-HDR compat/base.l3v3_s.part \
-HDR compat/base.l4v4_s.part \
-HDR base.m_s.part \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR base.lo_s.part \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR compat/base.o_s.part base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
+	compat/base.lists.part \
+	HDR base.m_k.part \
+	HDR base.l1_k.part \
+	HDR base.l_k.part \
+	HDR base.o_k.part \
+	HDR base.ml_g.part \
+	HDR base.m_g.part \
+	HDR compat/base.mlv_s.part base.mlv_s.part \
+	HDR compat/base.ml_s.part base.ml_s.part  \
+	HDR compat/base.ml1_s.part base.ml1_s.part \
+	HDR compat/base.ml1v1_s.part \
+	HDR compat/base.l2_s.part base.l2_s.part  \
+	HDR compat/base.l3_s.part base.l3_s.part  \
+	HDR compat/base.l4_s.part base.l4_s.part  \
+	HDR compat/base.l2v2_s.part \
+	HDR compat/base.l3v3_s.part \
+	HDR compat/base.l4v4_s.part \
+	HDR base.m_s.part \
+	HDR base.ml_c.part \
+	HDR base.ml1_c.part \
+	HDR base.m_t.part \
+	HDR base.lo_s.part \
+	HDR base.l1o_s.part \
+	HDR base.l2o_s.part \
+	HDR base.l3o_s.part \
+	HDR base.l4o_s.part \
+	HDR compat/base.o_s.part base.o_s.part \
+	HDR base.o_c.part \
+	HDR base.o_t.part
+
+files= base base.lst base.xml
 
 srcdir=	${XKB_DIR}/rules
 
-all:	_SUBDIRUSE files
+all:	_SUBDIRUSE ${files}
 
-files: base base.lst base.xml
+depend:	_SUBDIRUSE
 
-base: $(base_parts_no_compat)
+base: $(base_parts)
 	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)
 
 base.lst: base.xml
@@ -51,6 +53,11 @@ base.lst: base.xml
 
 base.xml: base.xml.in
 	sed -e 's,<_,<,g' -e 's,</_,</,g' ${XKB_DIR}/${XKB_SUBDIR}/base.xml.in > $@
+install-files: ${files}
+	@for i in ${files}; do  \
+		echo "installing $$i"; \
+		${INSTALL_DATA} $$i ${XKB_BASE}/${XKB_SUBDIR}; \
+	done
 
 clean: _SUBDIRUSE
 	rm -f base base.lst base.xml