[PATCH 1/2] configure: put xkbcomp output in ${localstatedir} by default, not ${datadir}

Julien Cristau jcristau at debian.org
Sat Jul 14 07:07:50 PDT 2012


datadir is for static data, not stuff that's written to at run time.

Signed-off-by: Julien Cristau <jcristau at debian.org>
---
Not sure exactly which path should be used as the default.  Debian uses
${localstatedir}/lib/xkb instead, so does Fedora AFAICT.

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6456192..de12bb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -516,9 +516,9 @@ AC_MSG_RESULT([$FONTPATH])
 AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
 				[ XKBPATH="$withval" ],
 				[ XKBPATH="${datadir}/X11/xkb" ])
-AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
+AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/X11/xkb)]),
 				[ XKBOUTPUT="$withval" ],
-				[ XKBOUTPUT="compiled" ])
+				[ XKBOUTPUT="${localstatedir}/X11/xkb" ])
 AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
                                    [Keyboard ruleset (default: base/evdev)]),
                                 [ XKB_DFLT_RULES="$withval" ],
-- 
1.7.10.4



More information about the xorg-devel mailing list