Change the default location for compiled XKB keyboard descriptions
(output from xkbcomp) so that it complies with FHS3 and it does
not use datarootdir (usually based under /usr) which is reserved to
read-only architecture-indipendent data.
Signed-off-by: Guido Trentalancia <[email protected]>
---
Makefile.am | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -pru xserver-orig/configure.ac xserver/configure.ac
--- xserver-orig/configure.ac 2016-12-30 18:11:36.275028186 +0100
+++ xserver/configure.ac 2016-12-30 18:14:38.267632613 +0100
@@ -534,7 +534,7 @@ 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}/lib/xkb/compiled)]),
[ XKBOUTPUT="$withval" ],
[ XKBOUTPUT="compiled" ])
AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
diff -pru xserver-orig/Makefile.am xserver/Makefile.am
--- xserver-orig/Makefile.am 2016-12-30 18:11:36.250027698 +0100
+++ xserver/Makefile.am 2016-12-30 18:13:53.823743042 +0100
@@ -77,7 +77,7 @@ EXTRA_DIST = xorg-server.pc.in xorg-serv
DISTCHECK_CONFIGURE_FLAGS=\
--with-xkb-path=$(XKB_BASE_DIRECTORY) \
--with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \
- --with-xkb-output='$${datadir}/X11/xkb/compiled'
+ --with-xkb-output='$${localstatedir}/lib/xkb/compiled'
.PHONY: ChangeLog INSTALL
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
