From 3abd9e912c4b1ed6abd0ff1f440f2105fcbdf4a2 Mon Sep 17 00:00:00 2001 From: aneejit1 Date: Fri, 3 Jul 2020 01:39:21 +0000 Subject: Ask pkg-config/find_file where we can find the X11 Xkb rules directory and add some more candidate paths for xkbd to search Signed-off-by: aneejit1 --- kxkb/x11helper.cpp | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'kxkb/x11helper.cpp') diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp index aa39845dd..1c8db4a4a 100644 --- a/kxkb/x11helper.cpp +++ b/kxkb/x11helper.cpp @@ -22,20 +22,37 @@ // Compiler will size array automatically. static const char* X11DirList[] = { +#ifdef X11_XKB_RULES_DIR + X11_XKB_RULES_DIR, +#endif XLIBDIR, "/usr/share/X11/", - "/etc/X11/", - "/usr/local/share/X11/", + "/usr/lib/X11/", + "/usr/lib64/X11/", + "/usr/X11/share/X11/", + "/usr/X11/lib/X11/", + "/usr/X11/lib64/X11/", + "/usr/X11R7/share/X11/", + "/usr/X11R7/lib/X11/", + "/usr/X11R7/lib64/X11/", + "/usr/X11R6/share/X11/", "/usr/X11R6/lib/X11/", "/usr/X11R6/lib64/X11/", + "/usr/local/X11/share/X11/", + "/usr/local/X11/lib/X11/", + "/usr/local/X11/lib64/X11/", + "/usr/local/X11R7/share/X11/", + "/usr/local/X11R7/lib/X11/", + "/usr/local/X11R7/lib64/X11/", + "/usr/local/X11R6/share/X11/", "/usr/local/X11R6/lib/X11/", "/usr/local/X11R6/lib64/X11/", - "/usr/lib/X11/", - "/usr/lib64/X11/", + "/usr/local/share/X11/", "/usr/local/lib/X11/", "/usr/local/lib64/X11/", "/usr/pkg/share/X11/", - "/usr/pkg/xorg/lib/X11/" + "/usr/pkg/xorg/lib/X11/", + "/etc/X11/" }; // Compiler will size array automatically. -- cgit v1.2.1