From 287336f3c9e5023acbfba6508b05a68ccca9ddf0 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Thu, 1 Sep 2005 19:56:14 +0000 Subject: Teach xkb how to optionally run xkbcomp from $bindir instead of $datadir/xkb. --- xkb/ddxLoad.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'xkb/ddxLoad.c') diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 71c742163..e355b1796 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -243,16 +243,21 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; if (XkbBaseDirectory!=NULL) { #ifndef __UNIXOS2__ char *xkbbasedir = XkbBaseDirectory; + char *xkbbindir = XkbBinDirectory; #else /* relocate the basedir and replace the slashes with backslashes */ char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory); + char *xkbbindir = (char*)__XOS2RedirRoot(XkbBinDirectory); int i; + for (i=0; i10)?10:(int)xkbDebugFlags)), xkbbasedir,(map?"-m ":""),(map?map:""), PRE_ERROR_MSG,ERROR_PREFIX,POST_ERROR_MSG1,file, @@ -337,16 +342,20 @@ char tmpname[PATH_MAX]; #endif #ifndef __UNIXOS2__ char *xkbbasedir = XkbBaseDirectory; + char *xkbbindir = XkbBinDirectory; #else int i; char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory); + char *xkbbindir = (char*)__XOS2RedirRoot(XkbBinDirectory); for (i=0; i10)?10:(int)xkbDebugFlags)), xkbbasedir, xkmfile, PRE_ERROR_MSG,ERROR_PREFIX,POST_ERROR_MSG1, -- cgit v1.2.3