From 7424060a895ea6beaaaa3cfcf090dd0438716aa9 Mon Sep 17 00:00:00 2001
From: David Michael <fedora.dm0@gmail.com>
Date: Fri, 16 Aug 2013 17:32:01 +0200
Subject: config.make: Use more configure settings when building xkb-data

* config.make.in (datarootdir,LEX,YACC): New variables.
* configure.ac (XKB_BASE): Drop extraneous "/share" from path.
* configure.ac: Reset pkg-config status between tests.
---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 31e48efd..b8275360 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,8 +246,9 @@ PKG_CHECK_MODULES([X11], [x11 xproto],
     AS_IF([test $pkg_failed = no],
       [XKB_BASE="$pkg_cv_XKB_BASE"
        AC_MSG_RESULT([$XKB_BASE])],
-      [XKB_BASE="$datadir/share/X11/xkb"
+      [XKB_BASE="$datadir/X11/xkb"
        AC_MSG_RESULT([(default) $XKB_BASE])])
+    pkg_failed=no
     AC_MSG_CHECKING([for X11 prefix])
     _PKG_CONFIG([X11_PREFIX], [variable=prefix], [x11])
     AS_IF([test $pkg_failed = no],
-- 
cgit v1.2.3