[PATCH 2/2] Add script to report XKB output directory, xserver-keymap-dir

[Keith Packard]

This can be used to clear any cache files when loading new XKB
configuration files.

It gets installed in $(SERVERCONFIG) (by default, $libdir/xorg)

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 configure.ac              |    3 ++-
 xkb/Makefile.am           |    8 +++++++-
 xkb/xserver-keymap-dir.in |    2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 xkb/xserver-keymap-dir.in

diff --git a/configure.ac b/configure.ac
index aa65159..a22f014 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2236,6 +2236,7 @@ os/Makefile
 randr/Makefile
 render/Makefile
 xkb/Makefile
+xkb/xserver-keymap-dir
 Xext/Makefile
 Xi/Makefile
 xfixes/Makefile
@@ -2311,4 +2312,4 @@ test/Makefile
 test/xi2/Makefile
 xserver.ent
 xorg-server.pc
-])
+], [chmod +x xkb/xserver-keymap-dir])
diff --git a/xkb/Makefile.am b/xkb/Makefile.am
index fb3ccbf..43b2fe6 100644
--- a/xkb/Makefile.am
+++ b/xkb/Makefile.am
@@ -37,7 +37,13 @@ X11_SRCS = \
 libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XKBFILE_SRCS) $(X11_SRCS)
 libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
 
-EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h
+EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h xserver-keymap-dir.in
 
 xkbcompileddir = $(XKB_COMPILED_DIR)
 dist_xkbcompiled_DATA = README.compiled
+
+xkbbindir = $(SERVER_MISC_CONFIG_PATH)
+
+xkbbin_SCRIPTS = xserver-keymap-dir
+
+CLEANFILES=$(xkbbin_SCRIPTS)
diff --git a/xkb/xserver-keymap-dir.in b/xkb/xserver-keymap-dir.in
new file mode 100644
index 0000000..da6e89b
--- /dev/null
+++ b/xkb/xserver-keymap-dir.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo '@XKM_OUTPUT_DIR@'
-- 
1.7.10.4