TOP is a too generic name for a Makefile variable. It may be

present in users' enviroment to confirure top(1). Rename it to
XKC_TOP. Problem noticed by naddy@.

7 files changed, 21 insertions, 21 deletions

diff --git a/data/xkeyboard-config/Makefile.inc b/data/xkeyboard-config/Makefile.inc
index be75cba4a..f8f687efe 100644
--- a/data/xkeyboard-config/Makefile.inc
+++ b/data/xkeyboard-config/Makefile.inc
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2011/01/10 14:42:48 shadchin Exp $
+#	$OpenBSD: Makefile.inc,v 1.4 2011/06/06 19:45:44 matthieu Exp $
 
-TOP?=		../../..
-XKB_DIR=	${.CURDIR}/${TOP}/dist/xkeyboard-config
+XKC_TOP?=		../../..
+XKB_DIR=	${.CURDIR}/${XKC_TOP}/dist/xkeyboard-config
 XKB_BASE=	${DESTDIR}${X11BASE}/share/X11/xkb
 XKBCOMP=	xkbcomp
 
diff --git a/data/xkeyboard-config/geometry/Makefile.inc b/data/xkeyboard-config/geometry/Makefile.inc
index 963600788..742aa8c61 100644
--- a/data/xkeyboard-config/geometry/Makefile.inc
+++ b/data/xkeyboard-config/geometry/Makefile.inc
@@ -1,3 +1,3 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2009/06/06 17:55:01 matthieu Exp $
-TOP=	../../../..
+#	$OpenBSD: Makefile.inc,v 1.2 2011/06/06 19:45:44 matthieu Exp $
+XKC_TOP=	../../../..
 .include "../Makefile.inc"
diff --git a/data/xkeyboard-config/keycodes/Makefile.inc b/data/xkeyboard-config/keycodes/Makefile.inc
index a2a988cc0..742aa8c61 100644
--- a/data/xkeyboard-config/keycodes/Makefile.inc
+++ b/data/xkeyboard-config/keycodes/Makefile.inc
@@ -1,3 +1,3 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2011/01/10 14:42:48 shadchin Exp $
-TOP=	../../../..
+#	$OpenBSD: Makefile.inc,v 1.2 2011/06/06 19:45:44 matthieu Exp $
+XKC_TOP=	../../../..
 .include "../Makefile.inc"
diff --git a/data/xkeyboard-config/keymap/Makefile.inc b/data/xkeyboard-config/keymap/Makefile.inc
index b7b8f8df8..19e4b0e56 100644
--- a/data/xkeyboard-config/keymap/Makefile.inc
+++ b/data/xkeyboard-config/keymap/Makefile.inc
@@ -1,3 +1,3 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2009/06/06 17:55:01 matthieu Exp $
-TOP=	../../../..
+#	$OpenBSD: Makefile.inc,v 1.2 2011/06/06 19:45:44 matthieu Exp $
+XKC_TOP=	../../../..
 .include "../../Makefile.inc"
diff --git a/data/xkeyboard-config/rules/Makefile.inc b/data/xkeyboard-config/rules/Makefile.inc
index d12fdab50..8959d8ccc 100644
--- a/data/xkeyboard-config/rules/Makefile.inc
+++ b/data/xkeyboard-config/rules/Makefile.inc
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2011/01/10 14:42:48 shadchin Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2011/06/06 19:45:44 matthieu Exp $
 
-TOP=		../../../..
+XKC_TOP=		../../../..
 
 BINDIR=		${XKB_DIR}/${XKB_SUBDIR}/../bin
 SRCDIR=		${XKB_DIR}/${XKB_SUBDIR}
diff --git a/data/xkeyboard-config/symbols/Makefile b/data/xkeyboard-config/symbols/Makefile
index 54aa360b8..604cac548 100644
--- a/data/xkeyboard-config/symbols/Makefile
+++ b/data/xkeyboard-config/symbols/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2011/04/10 17:49:13 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.6 2011/06/06 19:45:44 matthieu Exp $
 
 SUBDIR=		digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr \
 		nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
@@ -6,13 +6,13 @@ SUBDIR=		digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr \
 XKB_SUBDIR=	symbols
 DIR_DATA=	symbols.dir
 
-DATA=	ad af al am apl ara at az ba bd be bg br brai bt bw by ca cd ch cn cz \
-	de dk ee es et epo fi fo fr gb ge gh gn gr hr hu ie il in iq ir is it \
-	jp ke kg kh kr kz la latam latin lk lt lv ma mao me mk ml mm mn mt mv \
-	ng nl no np pc ph pk pl pt ro rs ru se si sk sn sy th terminate tj tm \
-	tw tr tz ua us uz vn za altwin capslock compose ctrl empty eurosign \
-	rupeesign group inet keypad kpdl level3 level5 nbsp olpc shift \
-	srvr_ctrl typo
+DATA=	ad af al am apl ara at az ba bd be bg br brai bt bw by ca cd ch cm \
+	cn cz de dk ee es et epo fi fo fr gb ge gh gn gr hr hu ie il in iq \
+	ir is it jp ke kg kh kr kz la latam latin lk lt lv ma mao me mk ml \
+	mm mn mt mv ng nl no np pc ph pk pl pt ro rs ru se si sk sn sy th \
+	terminate tj tm tw tr tz ua us uz vn za altwin capslock compose \
+	ctrl empty eurosign rupeesign group inet keypad kpdl level3 level5 \
+	nbsp olpc shift srvr_ctrl typo
 
 # OpenBSD customization
 DATA+=	zaurus
diff --git a/data/xkeyboard-config/symbols/Makefile.inc b/data/xkeyboard-config/symbols/Makefile.inc
index b7b8f8df8..19e4b0e56 100644
--- a/data/xkeyboard-config/symbols/Makefile.inc
+++ b/data/xkeyboard-config/symbols/Makefile.inc
@@ -1,3 +1,3 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2009/06/06 17:55:01 matthieu Exp $
-TOP=	../../../..
+#	$OpenBSD: Makefile.inc,v 1.2 2011/06/06 19:45:44 matthieu Exp $
+XKC_TOP=	../../../..
 .include "../../Makefile.inc"