qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
present in users' enviroment to confirure top(1). Rename it to
XKC_TOP. Problem noticed by naddy@.
This commit is contained in:
matthieu 2011-06-06 19:45:44 +00:00
parent d4641ab8a9
commit 4f55bd08bb
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/xkeyboard-config/Makefile.inc
View File

@ -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

4
data/xkeyboard-config/geometry/Makefile.inc
View File

@ -1,3 +1,3 @@
# $OpenBSD: Makefile.inc,v 1.1.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"

4
data/xkeyboard-config/keycodes/Makefile.inc
View File

@ -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"

4
data/xkeyboard-config/keymap/Makefile.inc
View File

@ -1,3 +1,3 @@
# $OpenBSD: Makefile.inc,v 1.1.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"

4
data/xkeyboard-config/rules/Makefile.inc
View File

@ -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}

16
data/xkeyboard-config/symbols/Makefile
View File

@ -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

4
data/xkeyboard-config/symbols/Makefile.inc
View File

@ -1,3 +1,3 @@
# $OpenBSD: Makefile.inc,v 1.1.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"